summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2007-10-10 01:16:51 +0000
committerLex Spoon <lex@lexspoon.org>2007-10-10 01:16:51 +0000
commit07f4b0f82189a78cfb4c7394439dcc46c8a2cad7 (patch)
tree371d058251b61d65b6a11210680b946ec6f18c03
parent417417ef71774eb257ff917c345eb929f6705a8c (diff)
downloadscala-07f4b0f82189a78cfb4c7394439dcc46c8a2cad7.tar.gz
scala-07f4b0f82189a78cfb4c7394439dcc46c8a2cad7.tar.bz2
scala-07f4b0f82189a78cfb4c7394439dcc46c8a2cad7.zip
support the -e option for executing a command s...
support the -e option for executing a command specified on the command line
-rw-r--r--src/compiler/scala/tools/nsc/MainGenericRunner.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index 44a9fe13e0..bb10a39325 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -136,10 +136,12 @@ object MainGenericRunner {
urls(settings.Xcodebase.value)
command.thingToRun match {
- case None if settings.execute.value != "" =>
+ case _ if settings.execute.value != "" =>
+ val fullArgs =
+ command.thingToRun.toList ::: command.arguments
ScriptRunner.runCommand(settings,
settings.execute.value,
- command.arguments)
+ fullArgs)
case None =>
(new InterpreterLoop).main(settings)