diff options
author | Paul Phillips <paulp@improving.org> | 2011-06-03 03:59:12 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-06-03 03:59:12 +0000 |
commit | 33d45626bd1b13adfd36071cf8f4d94123c7d29d (patch) | |
tree | 181265875be9495dfd43b0f72db87d8ca4c26d5f /src/compiler/scala/tools/nsc/interpreter/ILoop.scala | |
parent | 92a2fd5397e1c6f67677e96bbf427ab256ec37f9 (diff) | |
download | scala-33d45626bd1b13adfd36071cf8f4d94123c7d29d.tar.gz scala-33d45626bd1b13adfd36071cf8f4d94123c7d29d.tar.bz2 scala-33d45626bd1b13adfd36071cf8f4d94123c7d29d.zip |
Misc accumulated repl work.
down into more flexible pieces. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/interpreter/ILoop.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/ILoop.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index 51f8da6063..75cbf6cdbc 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -7,7 +7,7 @@ package scala.tools.nsc package interpreter import Predef.{ println => _, _ } -import java.io.{ BufferedReader, FileReader, PrintWriter } +import java.io.{ BufferedReader, FileReader } import java.util.concurrent.locks.ReentrantLock import scala.sys.process.Process import session._ @@ -31,13 +31,13 @@ import io.{ File, Sources } * @author Lex Spoon * @version 1.2 */ -class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter) +class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) extends AnyRef with LoopCommands with ILoopInit { - def this(in0: BufferedReader, out: PrintWriter) = this(Some(in0), out) - def this() = this(None, new PrintWriter(Console.out, true)) + def this(in0: BufferedReader, out: JPrintWriter) = this(Some(in0), out) + def this() = this(None, new JPrintWriter(Console.out, true)) var in: InteractiveReader = _ // the input stream from which commands come var settings: Settings = _ @@ -861,7 +861,7 @@ object ILoop { stringFromStream { ostream => Console.withOut(ostream) { - val output = new PrintWriter(new OutputStreamWriter(ostream), true) { + val output = new JPrintWriter(new OutputStreamWriter(ostream), true) { override def write(str: String) = { // completely skip continuation lines if (str forall (ch => ch.isWhitespace || ch == '|')) () @@ -897,7 +897,7 @@ object ILoop { stringFromStream { ostream => Console.withOut(ostream) { val input = new BufferedReader(new StringReader(code)) - val output = new PrintWriter(new OutputStreamWriter(ostream), true) + val output = new JPrintWriter(new OutputStreamWriter(ostream), true) val repl = new ILoop(input, output) if (sets.classpath.isDefault) |