From 963aabbeb45e042f4b0d6f5ec13edb0136cbf441 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Mon, 6 Aug 2012 14:09:59 -0700 Subject: 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. --- test/pending/script/dashi.check | 1 + test/pending/script/dashi.flags | 1 + test/pending/script/dashi/a.scala | 2 ++ 3 files changed, 4 insertions(+) create mode 100644 test/pending/script/dashi.check create mode 100644 test/pending/script/dashi.flags create mode 100644 test/pending/script/dashi/a.scala (limited to 'test/pending') 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")) -- cgit v1.2.3