From f88c979f856ebcde94b3fc3c60d83039230c83d0 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 31 Mar 2011 06:09:14 +0000 Subject: Fix for interpreter issue with missing newlines... Fix for interpreter issue with missing newlines wreaking havoc. No review. --- src/compiler/scala/tools/nsc/interpreter/IMain.scala | 2 +- test/files/run/repl-assign.check | 14 ++++++++++++++ test/files/run/repl-assign.scala | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 test/files/run/repl-assign.check create mode 100644 test/files/run/repl-assign.scala diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala index 0dfc5f4483..8698aa7890 100644 --- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala +++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala @@ -1164,7 +1164,7 @@ object IMain { def apply(contributors: List[T]): String = stringFromWriter { code => code println preamble - contributors map generate foreach (code print _) + contributors map generate foreach (code println _) code println postamble } } diff --git a/test/files/run/repl-assign.check b/test/files/run/repl-assign.check new file mode 100644 index 0000000000..0181985f08 --- /dev/null +++ b/test/files/run/repl-assign.check @@ -0,0 +1,14 @@ +Type in expressions to have them evaluated. +Type :help for more information. + +scala> +scala> x: Int = 10 + +scala> y: Int = 11 + +scala> x: Int = 12 + +scala> y: Int = 13 + +scala> +scala> diff --git a/test/files/run/repl-assign.scala b/test/files/run/repl-assign.scala new file mode 100644 index 0000000000..ee3c1649d8 --- /dev/null +++ b/test/files/run/repl-assign.scala @@ -0,0 +1,10 @@ +import scala.tools.partest.ReplTest + +object Test extends ReplTest { + def code = """ +var x = 10 +var y = 11 +x = 12 +y = 13 + """ +} \ No newline at end of file -- cgit v1.2.3