diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-06-01 09:51:33 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-06-01 09:51:33 +0200 |
| commit | 90215ce2b9cb99b5dea7c0ef474eea50755c0a40 (patch) | |
| tree | 291b6c18bce82614411a14be77bda80844c7350c /src/compiler | |
| parent | 971f5abc37538e1c4e7f0eef6b175f7951634e86 (diff) | |
| parent | b462e5a97b499bc91222014e45ec2439f56b46b7 (diff) | |
| download | scala-90215ce2b9cb99b5dea7c0ef474eea50755c0a40.tar.gz scala-90215ce2b9cb99b5dea7c0ef474eea50755c0a40.tar.bz2 scala-90215ce2b9cb99b5dea7c0ef474eea50755c0a40.zip | |
Merge pull request #4998 from som-snytt/issue/7898-i
SI-7898 Read user input during REPL warmup
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 1289d55c37..d1f8db048b 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( |