diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 13:04:32 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 13:04:32 +0200 |
commit | 6c4414ee36186ee0add924b1655c827ee83d180b (patch) | |
tree | 649f37934b3a342006f7eda6b2b1082c5f64526f /src/compiler | |
parent | 8384ebda45724b5a4e47dd2a508ecbbc3bca56f4 (diff) | |
parent | 90215ce2b9cb99b5dea7c0ef474eea50755c0a40 (diff) | |
download | scala-6c4414ee36186ee0add924b1655c827ee83d180b.tar.gz scala-6c4414ee36186ee0add924b1655c827ee83d180b.tar.bz2 scala-6c4414ee36186ee0add924b1655c827ee83d180b.zip |
Merge commit '90215ce' into merge-2.11-to-2.12-june-1
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/GenericRunnerCommand.scala | 1 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/GenericRunnerSettings.scala | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala index 24496fa013..bab612bad5 100644 --- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala +++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala @@ -79,6 +79,7 @@ Other startup options: -howtorun what to run <script|object|jar|guess> (default: guess) -i <file> preload <file> before starting the repl + -I <file> preload <file>, enforcing line-by-line interpretation -e <string> execute <string> as if entered in the repl -save save the compiled script in a jar for future use -nc no compilation daemon: do not use the fsc offline compiler diff --git a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala index c82ed68da8..113c02e558 100644 --- a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala +++ b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala @@ -21,9 +21,15 @@ class GenericRunnerSettings(error: String => Unit) extends Settings(error) { val loadfiles = MultiStringSetting( + "-I", + "file", + "load a file line-by-line") + + val pastefiles = + MultiStringSetting( "-i", "file", - "load a file (assumes the code is given interactively)") + "paste a file") val execute = StringSetting( |