diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-09 17:46:04 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-09 17:46:04 -0800 |
commit | 71c596a2af1ce06d9e9e951916e4a3863375fbe0 (patch) | |
tree | 8be3567d3746386240f6f2a8eaffe3a0fdcbb118 /src/compiler | |
parent | 6724890e36c5c3c6a6b79f1b5322b9c2932de9e1 (diff) | |
parent | 9dfac45e808017982e04fb20567c70b76dee3ede (diff) | |
download | scala-71c596a2af1ce06d9e9e951916e4a3863375fbe0.tar.gz scala-71c596a2af1ce06d9e9e951916e4a3863375fbe0.tar.bz2 scala-71c596a2af1ce06d9e9e951916e4a3863375fbe0.zip |
Merge pull request #3433 from rjolly/si-7933
SI-7933 REPL javax.script eval is cached result
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/util/package.scala | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala index 4237f36ade..bd95fdbb50 100644 --- a/src/compiler/scala/tools/nsc/util/package.scala +++ b/src/compiler/scala/tools/nsc/util/package.scala @@ -7,7 +7,7 @@ package scala package tools package nsc -import java.io.{ OutputStream, PrintStream, ByteArrayOutputStream, PrintWriter, StringWriter } +import java.io.{ OutputStream, PrintStream, ByteArrayOutputStream, PrintWriter, StringWriter, Reader } package object util { // forwarder for old code that builds against 2.9 and 2.10 @@ -46,6 +46,17 @@ package object util { (result, ts2 filterNot (ts1 contains _)) } + def stringFromReader(reader: Reader) = { + val writer = new StringWriter() + var c = reader.read() + while(c != -1) { + writer.write(c) + c = reader.read() + } + reader.close() + writer.toString() + } + /** Generate a string using a routine that wants to write on a stream. */ def stringFromWriter(writer: PrintWriter => Unit): String = { val stringWriter = new StringWriter() |