summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2006-06-30 16:43:05 +0000
committerLex Spoon <lex@lexspoon.org>2006-06-30 16:43:05 +0000
commit6204bc36f0ffb1a6ab18daaf1f0b0c0c90086dae (patch)
tree71226a6c6aba383878a3360304fc1db96182e26b
parentf24e379577d3025306aaf547028da9f9e23d4d7b (diff)
downloadscala-6204bc36f0ffb1a6ab18daaf1f0b0c0c90086dae.tar.gz
scala-6204bc36f0ffb1a6ab18daaf1f0b0c0c90086dae.tar.bz2
scala-6204bc36f0ffb1a6ab18daaf1f0b0c0c90086dae.zip
renamed MainScript to ScriptRunner
-rw-r--r--src/compiler/scala/tools/nsc/MainGenericRunner.scala2
-rw-r--r--src/compiler/scala/tools/nsc/ScriptRunner.scala (renamed from src/compiler/scala/tools/nsc/MainScript.scala)3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index 12388cf2bd..5e83e8ad15 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -99,7 +99,7 @@ object MainGenericRunner {
e.getCause.printStackTrace
}
} else {
- MainScript.runScript(settings, thingToRun, command.arguments)
+ ScriptRunner.runScript(settings, thingToRun, command.arguments)
}
}
}
diff --git a/src/compiler/scala/tools/nsc/MainScript.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index d11577edd1..fcef8adfdf 100644
--- a/src/compiler/scala/tools/nsc/MainScript.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -35,8 +35,7 @@ import scala.tools.nsc.io._
* TODO: It would be better if error output went to stderr instead
* of stdout....
*/
- // XXX rename to ScriptRunner
-object MainScript {
+object ScriptRunner {
/** Choose a jar filename to hold the compiled version
* of a script
*/