Changed organisation of Scalac's command-line o...

Changed organisation of Scalac's command-line options to split them into
three categories: every-day use, advanced (-X) and private (-Y).

1 files changed, 15 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index f188510eca..2a1afd0ef6 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -50,11 +50,24 @@ class CompilerCommand(arguments: List[String], val settings: Settings,
   def xusageMsg: String = {
     settings.allSettings
       .filter(setting =>
-              !setting.isStandard &&
+              setting.isAdvanced &&
               (settings.doc.value == setting.isDocOption))
       .map(setting =>
            format(setting.helpSyntax) + "  " + setting.helpDescription)
-      .mkString("Possible non-standard options include:\n  ",
+      .mkString("Possible advanced options include:\n  ",
+                "\n  ",
+                "\n")
+  }
+
+  /** A message explaining usage and options */
+  def yusageMsg: String = {
+    settings.allSettings
+      .filter(setting =>
+              setting.isPrivate &&
+              (settings.doc.value == setting.isDocOption))
+      .map(setting =>
+           format(setting.helpSyntax) + "  " + setting.helpDescription)
+      .mkString("Possible private options include:\n  ",
                 "\n  ",
                 "\n")
   }