diff options
| author | Lex Spoon <lex@lexspoon.org> | 2007-07-22 17:07:38 +0000 |
|---|---|---|
| committer | Lex Spoon <lex@lexspoon.org> | 2007-07-22 17:07:38 +0000 |
| commit | 46b5d81c6b5e8ee5f3aae9db6389895b4d1ed690 (patch) | |
| tree | 55493f13ed81d77c33dfa4fcb875bf151e03dfb8 /src | |
| parent | 1fd4a4b280555298c94f703982a8084eaf237029 (diff) | |
| download | scala-46b5d81c6b5e8ee5f3aae9db6389895b4d1ed690.tar.gz scala-46b5d81c6b5e8ee5f3aae9db6389895b4d1ed690.tar.bz2 scala-46b5d81c6b5e8ee5f3aae9db6389895b4d1ed690.zip | |
the option for script compiling is now -Xscript
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index 166764e29a..e8f89a701a 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -233,7 +233,7 @@ class ScriptRunner { val compArgs = (coreCompArgs ::: - List("-script", scriptMain(settings), scriptFile)) + List("-Xscript", scriptMain(settings), scriptFile)) val socket = compileSocket.getOrCreateSocket("") val out = new PrintWriter(socket.getOutputStream(), true) diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 904eef29dd..6b0c92e4c6 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -133,7 +133,7 @@ class Settings(error: String => Unit) { val Xmatchalgo = ChoiceSetting ("-Ymatch-algo", "which match algorithm to use", List("both","par","incr"), "both") val noimports = BooleanSetting ("-Yno-imports", "Compile without any implicit imports") val nopredefs = BooleanSetting ("-Yno-predefs", "Compile without any implicit predefined values") - val script = StringSetting ("-Yscript", "object", "compile as a script, wrapping the code into object.main()", "").hideToIDE + val script = StringSetting ("-Xscript", "object", "compile as a script, wrapping the code into object.main()", "").hideToIDE val Xshowtrees = BooleanSetting ("-Yshow-trees", "Show detailed trees when used in connection with -print:phase") val skip = PhasesSetting ("-Yskip", "Skip") val Xsqueeze = ChoiceSetting ("-Ysqueeze", "if on, creates compact code in matching", List("on","on","off"), "on") |