diff options
| author | Szabolcs Berecz <szabolcs.berecz@gmail.com> | 2012-01-20 00:16:14 +0100 |
|---|---|---|
| committer | Szabolcs Berecz <szabolcs.berecz@gmail.com> | 2012-01-20 00:23:09 +0100 |
| commit | 5d782f24fcb339dfeb9250c329e99ad11983f89d (patch) | |
| tree | 989e0797cdbc6b10c3378ec43ea8b1bafd827a9a | |
| parent | 8deade7d868dbd79194621d815ee6eee46f9807d (diff) | |
| download | scala-5d782f24fcb339dfeb9250c329e99ad11983f89d.tar.gz scala-5d782f24fcb339dfeb9250c329e99ad11983f89d.tar.bz2 scala-5d782f24fcb339dfeb9250c329e99ad11983f89d.zip | |
Closes SI-5066
readLine("%s", "prompt") printed "WrappedArray(prompt)"
readLine("%s%s", "pro", "mpt") threw a MissingFormatArgumentException
| -rw-r--r-- | src/library/scala/Predef.scala | 2 | ||||
| -rw-r--r-- | test/files/run/Predef.readLine.check | 3 | ||||
| -rw-r--r-- | test/files/run/Predef.readLine.scala | 10 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index b175fb9e1d..824e048e73 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -269,7 +269,7 @@ object Predef extends LowPriorityImplicits { def printf(text: String, xs: Any*) = Console.print(text.format(xs: _*)) def readLine(): String = Console.readLine() - def readLine(text: String, args: Any*) = Console.readLine(text, args) + def readLine(text: String, args: Any*) = Console.readLine(text, args: _*) def readBoolean() = Console.readBoolean() def readByte() = Console.readByte() def readShort() = Console.readShort() diff --git a/test/files/run/Predef.readLine.check b/test/files/run/Predef.readLine.check new file mode 100644 index 0000000000..4fb2bc4c6a --- /dev/null +++ b/test/files/run/Predef.readLine.check @@ -0,0 +1,3 @@ +prompt +fancy prompt +immensely fancy prompt
\ No newline at end of file diff --git a/test/files/run/Predef.readLine.scala b/test/files/run/Predef.readLine.scala new file mode 100644 index 0000000000..9f07936638 --- /dev/null +++ b/test/files/run/Predef.readLine.scala @@ -0,0 +1,10 @@ +import java.io.StringReader + +object Test extends App { + Console.withIn(new StringReader("")) { + readLine() + readLine("prompt\n") + readLine("%s prompt\n", "fancy") + readLine("%s %s prompt\n", "immensely", "fancy") + } +}
\ No newline at end of file |