summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-01 13:04:32 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-01 13:04:32 +0200
commit6c4414ee36186ee0add924b1655c827ee83d180b (patch)
tree649f37934b3a342006f7eda6b2b1082c5f64526f /src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
parent8384ebda45724b5a4e47dd2a508ecbbc3bca56f4 (diff)
parent90215ce2b9cb99b5dea7c0ef474eea50755c0a40 (diff)
downloadscala-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/scala/tools/nsc/GenericRunnerSettings.scala')
-rw-r--r--src/compiler/scala/tools/nsc/GenericRunnerSettings.scala8
1 files changed, 7 insertions, 1 deletions
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(