summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/MainGenericRunner.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-06-15 16:22:40 +0000
committermichelou <michelou@epfl.ch>2006-06-15 16:22:40 +0000
commit42bd0dce6c2ad1881ad3df16ea19b02b43ec9f6d (patch)
treee7dfd190ffee58e665170f290b3c1b86a358f044 /src/compiler/scala/tools/nsc/MainGenericRunner.scala
parentaf68b2f871a990297c2168d3fe9219393915d463 (diff)
downloadscala-42bd0dce6c2ad1881ad3df16ea19b02b43ec9f6d.tar.gz
scala-42bd0dce6c2ad1881ad3df16ea19b02b43ec9f6d.tar.bz2
scala-42bd0dce6c2ad1881ad3df16ea19b02b43ec9f6d.zip
added header and svn:keywords to files *Generic...
added header and svn:keywords to files *Generic*.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/MainGenericRunner.scala')
-rw-r--r--src/compiler/scala/tools/nsc/MainGenericRunner.scala26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index 2df23c2539..bbdd87d645 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -1,12 +1,15 @@
-package scala.tools.nsc
-import java.io.File
-
-/* NSC -- new scala compiler
+/* NSC -- new Scala compiler
* Copyright 2006 LAMP/EPFL
* @author Lex Spoon
*/
+
// $Id$
+package scala.tools.nsc
+
+import java.io.File
+
+
/** An object that runs Scala code. It has three possible
* sources for the code to run: pre-compiled code, a script file,
* or interactive entry.
@@ -15,19 +18,19 @@ object MainGenericRunner {
def main(args: Array[String]): Unit = {
def error(str: String) = Console.println(str)
val command = new GenericRunnerCommand(args.toList, error)
- if(!command.ok) {
+ if (!command.ok) {
Console.println(command.usageMessage)
return ()
}
val settings = command.settings
- if(settings.help.value) {
+ if (settings.help.value) {
Console.println(command.usageMessage)
return ()
}
- if(settings.version.value) {
+ if (settings.version.value) {
val version =
System.getProperty("scala.tool.version", "unknown version")
Console.println("scala version " + version)
@@ -36,10 +39,10 @@ object MainGenericRunner {
}
command.thingToRun match {
- case None => {
+ case None =>
(new InterpreterLoop).main(settings)
- }
- case Some(thingToRun) => {
+
+ case Some(thingToRun) =>
val isObjectName =
settings.howtorun.value match {
case "guess" => !(new File(thingToRun)).exists
@@ -47,7 +50,7 @@ object MainGenericRunner {
case "script" => false
}
- if(isObjectName) {
+ if (isObjectName) {
def paths(str: String) = str.split(File.pathSeparator).toList
val classpath =
@@ -58,7 +61,6 @@ object MainGenericRunner {
} else {
MainScript.runScript(settings, thingToRun, command.arguments)
}
- }
}
}
}