summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/CompilerCommand.scala
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2009-11-30 15:46:19 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2009-11-30 15:46:19 +0000
commit41253da6fbf3fb8aa755ebe8318a83795ced2547 (patch)
tree58aab58164397b0ac5816281f1f9f252208b5b8f /src/compiler/scala/tools/nsc/CompilerCommand.scala
parente73ce61377783a1494be7a748693457656826d95 (diff)
downloadscala-41253da6fbf3fb8aa755ebe8318a83795ced2547.tar.gz
scala-41253da6fbf3fb8aa755ebe8318a83795ced2547.tar.bz2
scala-41253da6fbf3fb8aa755ebe8318a83795ced2547.zip
closes #1904
Diffstat (limited to 'src/compiler/scala/tools/nsc/CompilerCommand.scala')
-rw-r--r--src/compiler/scala/tools/nsc/CompilerCommand.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index ec564f17db..24842a5fcc 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -52,6 +52,7 @@ class CompilerCommand(
/** Messages explaining usage and options */
def usageMsg = createUsageMsg("where possible standard", _.isStandard)
+ def fscUsageMsg = createUsageMsg("where possible standard", ( st => st.isStandard || st.isFscSpecific ))
def xusageMsg = createUsageMsg("Possible advanced", _.isAdvanced)
def yusageMsg = createUsageMsg("Possible private", _.isPrivate)
@@ -59,6 +60,8 @@ class CompilerCommand(
// an informative message of some sort should be printed instead.
// (note: do not add "files.isEmpty" do this list)
val stopSettings = List[(() => Boolean, (Global) => String)](
+ ((() => (settings.help.value _)() && (cmdName == "fsc")),
+ fscUsageMsg + _.pluginOptionsHelp),
(settings.help.value _, usageMsg + _.pluginOptionsHelp),
(settings.Xhelp.value _, _ => xusageMsg),
(settings.Yhelp.value _, _ => yusageMsg),