diff options
| author | Paul Phillips <paulp@improving.org> | 2009-02-06 21:58:09 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-02-06 21:58:09 +0000 |
| commit | 3c43622fb2fea02bf7fbdac383c994b86e7d54c2 (patch) | |
| tree | 75e74895087e1152f1ac820654c8bcd427595142 /src | |
| parent | 8765cfe472557026ad8d4bc0ca56ba1956ec2d65 (diff) | |
| download | scala-3c43622fb2fea02bf7fbdac383c994b86e7d54c2.tar.gz scala-3c43622fb2fea02bf7fbdac383c994b86e7d54c2.tar.bz2 scala-3c43622fb2fea02bf7fbdac383c994b86e7d54c2.zip | |
Inelegant fix for bug #1602; will revisit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompilerCommand.scala | 6 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/GenericRunnerCommand.scala | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala index d256635548..1c1d17a638 100644 --- a/src/compiler/scala/tools/nsc/CompilerCommand.scala +++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala @@ -144,5 +144,9 @@ class CompilerCommand(arguments: List[String], val settings: Settings, ok &&= settings.checkDependencies } - processArguments() + // setting up a hook so GenericRunnerCommand (at least) can see processArguments + // run after this constructor completes, but without seeing it run twice + val shouldProcessArguments = true + if (shouldProcessArguments) + processArguments() } diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala index 094b2b4d1f..72f1e1e3f2 100644 --- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala +++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala @@ -50,7 +50,8 @@ extends CompilerCommand(allargs, settings, error, false) } } - processArguments() + override val shouldProcessArguments = false // tell superclass not to process arguments + processArguments() // ...and process them ourselves override def usageMsg = { cmdName + " [ <option> ]... [<torun> <arguments>]\n" + |