diff options
| author | Som Snytt <som.snytt@gmail.com> | 2014-05-28 18:04:29 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2014-05-29 08:09:37 -0700 |
| commit | 56e6726c0cabb075b2135ef1a71054aaf7ea6fd0 (patch) | |
| tree | 911624751ddc4324f147cf8116cc1b1fa0d5d491 /src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | |
| parent | c8f8782f6a07d1cc3297f22b1798f8e2d562db88 (diff) | |
| download | scala-56e6726c0cabb075b2135ef1a71054aaf7ea6fd0.tar.gz scala-56e6726c0cabb075b2135ef1a71054aaf7ea6fd0.tar.bz2 scala-56e6726c0cabb075b2135ef1a71054aaf7ea6fd0.zip | |
SI-8503 -version is info setting
And the Scala runner exits with 0 for info settings.
Producing the version string is consolidated.
The compiler driver uses the default settings hook to
short-circuit on -version. That's to avoid creating
the compiler; really it should check shouldStopWithInfo
first, as the runner does.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 20ccc30ff6..d22dcacad6 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -42,7 +42,7 @@ trait ScalaSettings extends AbsScalaSettings def optimiseSettings = List[BooleanSetting](inline, inlineHandlers, Xcloselim, Xdce, YconstOptimization) /** If any of these settings is enabled, the compiler should print a message and exit. */ - def infoSettings = List[Setting](help, Xhelp, Yhelp, showPlugins, showPhases, genPhaseGraph) + def infoSettings = List[Setting](version, help, Xhelp, Yhelp, showPlugins, showPhases, genPhaseGraph) /** Is an info setting set? */ def isInfo = infoSettings exists (_.isSetByUser) |