diff options
author | Paul Phillips <paulp@improving.org> | 2012-08-06 14:09:59 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-08-06 14:09:59 -0700 |
commit | 963aabbeb45e042f4b0d6f5ec13edb0136cbf441 (patch) | |
tree | 0afe1b93e90088dd35c426c56f559a8116342cfe /test | |
parent | b65b7b13924a86d38e04873f9c68d69590dec661 (diff) | |
download | scala-963aabbeb45e042f4b0d6f5ec13edb0136cbf441.tar.gz scala-963aabbeb45e042f4b0d6f5ec13edb0136cbf441.tar.bz2 scala-963aabbeb45e042f4b0d6f5ec13edb0136cbf441.zip |
Fix for SI-4945, repl hang on -i input.
Other breakage had accumulated among Settings. I determined
that once upon a time, "MultiStringSetting" accepted arguments
like this:
scala -foo bip bop bar
Somewhere this was changed to force a : argument, like
scala -foo:bip,bop,bar
This incurs breakage. The repl has always advertised its -i
option without a colon and it has always been a MultiStringSetting.
Forcing everything into the : seemed like the wrong thing,
especially because it will stomp on any whitespace containing
arguments, whereas in the original form
scala -foo bip "bop bar" baz
will yield its arguments as given.
So lacking any good ideas and knowing something probably depends
on each way already, I made it work both ways.
Diffstat (limited to 'test')
-rw-r--r-- | test/pending/script/dashi.check | 1 | ||||
-rw-r--r-- | test/pending/script/dashi.flags | 1 | ||||
-rw-r--r-- | test/pending/script/dashi/a.scala | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/test/pending/script/dashi.check b/test/pending/script/dashi.check new file mode 100644 index 0000000000..c3cf137155 --- /dev/null +++ b/test/pending/script/dashi.check @@ -0,0 +1 @@ +test.bippy = dingus diff --git a/test/pending/script/dashi.flags b/test/pending/script/dashi.flags new file mode 100644 index 0000000000..5b46a61e4f --- /dev/null +++ b/test/pending/script/dashi.flags @@ -0,0 +1 @@ +-i dashi/a.scala -e 'setBippy ; getBippy' diff --git a/test/pending/script/dashi/a.scala b/test/pending/script/dashi/a.scala new file mode 100644 index 0000000000..c4a07bf9ba --- /dev/null +++ b/test/pending/script/dashi/a.scala @@ -0,0 +1,2 @@ +def setBippy = sys.props("test.bippy") = "dingus" +def getBippy = println("test.bippy = " + sys.props("test.bippy")) |