diff options
| author | michelou <michelou@epfl.ch> | 2007-10-10 09:31:37 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-10-10 09:31:37 +0000 |
| commit | eadef1561317aee65203ea31212ad8a1ae35fe12 (patch) | |
| tree | 69d8e4c31894902b33a6882987cd081bf9672011 | |
| parent | 43daceac4777b88313fa9a5e324e44457574540b (diff) | |
| download | scala-eadef1561317aee65203ea31212ad8a1ae35fe12.tar.gz scala-eadef1561317aee65203ea31212ad8a1ae35fe12.tar.bz2 scala-eadef1561317aee65203ea31212ad8a1ae35fe12.zip | |
updated man pages with new scala options
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 23 | ||||
| -rw-r--r-- | src/manual/scala/man1/scala.scala | 11 |
2 files changed, 21 insertions, 13 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index bbdebf63fb..91fcaa87f2 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -304,18 +304,18 @@ class Settings(error: String => Unit) { protected val nameColon = name + ":" def tryToSet(args: List[String]): List[String] = args match { - case arg :: rest if (arg.startsWith(nameColon)) => - val toadd = arg.substring(nameColon.length()) + case arg :: rest if (arg startsWith nameColon) => + val toadd = arg.substring(nameColon.length()) if (toadd.length == 0) { - error("empty argument to " + nameColon) - args - } else { - appendToValue(toadd) - rest - } - - case opt :: arg :: rest if(opt == name) => - appendToValue(arg) + error("empty argument to " + nameColon) + args + } else { + appendToValue(toadd) + rest + } + + case opt :: arg :: rest if (opt == name) => + appendToValue(arg) rest case _ => args @@ -328,7 +328,6 @@ class Settings(error: String => Unit) { yield nameColon+opt } - /** A setting represented by a string in a given set of <code>choices</code>, * (<code>default</code> unless set). */ diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala index cdaf341577..a3f4044fe9 100644 --- a/src/manual/scala/man1/scala.scala +++ b/src/manual/scala/man1/scala.scala @@ -40,6 +40,15 @@ object scala extends Command { "."), Definition( + Mono("-i"), + "Requests that a file be pre-loaded. It is only " & + "meaningful for interactive shells."), + + Definition( + Mono("-e"), + "Requests that its argument be executed as Scala code."), + + Definition( Mono("-savecompiled"), "Save this compiled version of scripts in order to speed up " & "later executions of the same script. When running a script, " & @@ -243,7 +252,7 @@ object scala extends Command { title = command date = lastModified author = "Stephane Micheloud" - version = "0.4" + version = "0.5" sections = List( name, synopsis, |