diff options
author | Paul Phillips <paulp@improving.org> | 2011-03-31 05:58:01 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-03-31 05:58:01 +0000 |
commit | c81e94b5dd39cf86abd0145fc93e0999f57a548c (patch) | |
tree | b9f2f6203b97a1ca2fd55991b2aa7a5c37ef65c3 /src/compiler | |
parent | 56b7e67051af95bdc7b21b3a7d9333af40ee2e7f (diff) | |
download | scala-c81e94b5dd39cf86abd0145fc93e0999f57a548c.tar.gz scala-c81e94b5dd39cf86abd0145fc93e0999f57a548c.tar.bz2 scala-c81e94b5dd39cf86abd0145fc93e0999f57a548c.zip |
Some minor sensibility improvements to previous...
Some minor sensibility improvements to previous patch, and tearing out
some obsolete pieces of scalap. No review.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/MainGenericRunner.scala | 14 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/ScalaDoc.scala | 31 |
2 files changed, 23 insertions, 22 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala index 7ead4cce4a..f2d4bacb35 100644 --- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala +++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala @@ -19,7 +19,7 @@ import GenericRunnerCommand._ * sources for the code to run: pre-compiled code, a script file, * or interactive entry. */ -object MainGenericRunner { +class MainGenericRunner { def errorFn(ex: Throwable): Boolean = { ex.printStackTrace() false @@ -29,11 +29,6 @@ object MainGenericRunner { false } - def main(args: Array[String]) { - if (!process(args)) - sys.exit(1) - } - def process(args: Array[String]): Boolean = { val command = new GenericRunnerCommand(args.toList, (x: String) => errorFn(x)) import command.{ settings, howToRun, thingToRun } @@ -88,3 +83,10 @@ object MainGenericRunner { } } } + +object MainGenericRunner extends MainGenericRunner { + def main(args: Array[String]) { + if (!process(args)) + sys.exit(1) + } +} diff --git a/src/compiler/scala/tools/nsc/ScalaDoc.scala b/src/compiler/scala/tools/nsc/ScalaDoc.scala index dddb027e23..da31ca833d 100644 --- a/src/compiler/scala/tools/nsc/ScalaDoc.scala +++ b/src/compiler/scala/tools/nsc/ScalaDoc.scala @@ -8,19 +8,10 @@ package scala.tools.nsc import java.io.File.pathSeparator import scala.tools.nsc.doc.DocFactory -import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} -import scala.tools.nsc.util.FakePos //{Position} +import scala.tools.nsc.reporters.ConsoleReporter +import scala.tools.nsc.util.FakePos import Properties.msilLibPath -class ScaladocCommand(arguments: List[String], settings: doc.Settings) extends CompilerCommand(arguments, settings) { - override def cmdName = "scaladoc" - override def usageMsg = ( - createUsageMsg("where possible scaladoc", false, x => x.isStandard && settings.isScaladocSpecific(x.name)) + - "\n\nStandard scalac options also available:" + - createUsageMsg(x => x.isStandard && !settings.isScaladocSpecific(x.name)) - ) -} - /** The main class for scaladoc, a front-end for the Scala compiler * that generates documentation from source files. */ @@ -35,12 +26,10 @@ class ScalaDoc { // symbols just because there was an error override def hasErrors = false } - val command = new ScaladocCommand(args.toList, docSettings) + val command = new ScalaDoc.Command(args.toList, docSettings) if (docSettings.version.value) reporter.info(null, versionMsg, true) - else if (docSettings.help.value) - reporter.info(null, command.usageMsg, true) else if (docSettings.Xhelp.value) reporter.info(null, command.xusageMsg, true) else if (docSettings.Yhelp.value) @@ -49,12 +38,13 @@ class ScalaDoc { reporter.warning(null, "Plugins are not available when using Scaladoc") else if (docSettings.showPhases.value) reporter.warning(null, "Phases are restricted when using Scaladoc") + else if (docSettings.help.value || command.files.isEmpty) + reporter.info(null, command.usageMsg, true) else try { if (docSettings.target.value == "msil") msilLibPath foreach (x => docSettings.assemrefs.value += (pathSeparator + x)) - if (command.files.isEmpty) reporter.info(null, command.usageMsg, true) - else new DocFactory(reporter, docSettings) document command.files + new DocFactory(reporter, docSettings) document command.files } catch { case ex @ FatalError(msg) => @@ -70,6 +60,15 @@ class ScalaDoc { } object ScalaDoc extends ScalaDoc { + class Command(arguments: List[String], settings: doc.Settings) extends CompilerCommand(arguments, settings) { + override def cmdName = "scaladoc" + override def usageMsg = ( + createUsageMsg("where possible scaladoc", false, x => x.isStandard && settings.isScaladocSpecific(x.name)) + + "\n\nStandard scalac options also available:" + + createUsageMsg(x => x.isStandard && !settings.isScaladocSpecific(x.name)) + ) + } + def main(args: Array[String]): Unit = sys exit { if (process(args)) 0 else 1 } |