summaryrefslogtreecommitdiff
path: root/src/compiler
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
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')
-rw-r--r--src/compiler/scala/tools/nsc/GenericRunnerCommand.scala9
-rw-r--r--src/compiler/scala/tools/nsc/GenericRunnerSettings.scala9
-rw-r--r--src/compiler/scala/tools/nsc/MainGenericRunner.scala26
-rw-r--r--src/compiler/scala/tools/nsc/ObjectRunner.scala23
4 files changed, 46 insertions, 21 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
index 7fbf0d8f21..9d071e1b0a 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
@@ -1,7 +1,14 @@
+/* NSC -- new Scala compiler
+ * Copyright 2006 LAMP/EPFL
+ * @author Lex Spoon
+ */
+
+// $Id$
+
package scala.tools.nsc
/** A command for ScriptRunner */
-class GenericRunnerCommand(allargs: List[String], error: String=>Unit) {
+class GenericRunnerCommand(allargs: List[String], error: String => Unit) {
def this(allargs: List[String]) = this(allargs, str:String => {
Console.println("Error: " + str)
})
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
index f77e2efe86..52c17aba6c 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
@@ -1,6 +1,13 @@
+/* NSC -- new Scala compiler
+ * Copyright 2006 LAMP/EPFL
+ * @author Lex Spoon
+ */
+
+// $Id$
+
package scala.tools.nsc
-class GenericRunnerSettings(error: String=>Unit)
+class GenericRunnerSettings(error: String => Unit)
extends Settings(error) {
val howtorun =
ChoiceSetting(
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)
}
- }
}
}
}
diff --git a/src/compiler/scala/tools/nsc/ObjectRunner.scala b/src/compiler/scala/tools/nsc/ObjectRunner.scala
index 5649fcbc05..cf636af7ab 100644
--- a/src/compiler/scala/tools/nsc/ObjectRunner.scala
+++ b/src/compiler/scala/tools/nsc/ObjectRunner.scala
@@ -1,15 +1,23 @@
+/* NSC -- new Scala compiler
+ * Copyright 2005-2006 LAMP/EPFL
+ * @author Lex Spoon
+ */
+
+// $Id$
+
package scala.tools.nsc
-import java.net.URLClassLoader
+
import java.io.File
import java.lang.reflect.{Method,Modifier}
+import java.net.URLClassLoader
/** An object that runs another object specified by name. */
object ObjectRunner {
+
def isMainMethod(meth: Method): Boolean = {
- def paramsOK(params: Array[Class]): Boolean = {
- (params.length == 1) &&
- (params(0) == classOf[Array[String]])
- }
+ def paramsOK(params: Array[Class]): Boolean =
+ params.length == 1 &&
+ params(0) == classOf[Array[String]]
meth.getName == "main" &&
Modifier.isStatic(meth.getModifiers) &&
paramsOK(meth.getParameterTypes)
@@ -21,11 +29,12 @@ object ObjectRunner {
arguments: Seq[String]): Unit =
{
val classpathURLs = classpath.map(s => new File(s).toURL).toArray
- val mainLoader = new URLClassLoader(classpathURLs, null)
+ val mainLoader = new URLClassLoader(classpathURLs, null)
val clsToRun = Class.forName(objectName, true, mainLoader)
val method = clsToRun.getMethods.find(isMainMethod) match {
- case Some(meth) => meth
+ case Some(meth) =>
+ meth
case None => {
throw new Error("no main method in object " + objectName)
}