Merge pull request #9021 from rjolly/master

Script engine : implement eval(reader)

Author: smarter

compiler/src/dotty/tools/repl/ScriptEngine.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package repl
 
-import java.io.Reader
+import java.io.{Reader, StringWriter}
 import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine => JScriptEngine, ScriptEngineFactory, ScriptException, SimpleBindings}
 import dotc.core.StdNames.str
 
@@ -44,7 +44,20 @@ class ScriptEngine extends AbstractScriptEngine {
   }
 
   @throws[ScriptException]
-  def eval(reader: Reader, context: ScriptContext): Object = throw new UnsupportedOperationException
+  def eval(reader: Reader, context: ScriptContext): Object = eval(stringFromReader(reader), context)
+
+  private val buffer = new Array[Char](8192)
+
+  def stringFromReader(in: Reader) = {
+    val out = new StringWriter
+    var n = in.read(buffer)
+    while (n > -1) {
+      out.write(buffer, 0, n)
+      n = in.read(buffer)
+    }
+    in.close
+    out.toString
+  }
 }
 
 object ScriptEngine {

tests/run-with-compiler/scripting.check

@@ -1,2 +1,3 @@
 42
 42
+42

tests/run-with-compiler/scripting.scala

@@ -4,5 +4,6 @@ object Test {
     val e = m.getEngineByName("scala")
     println(e.eval("42"))
     println(e.eval("Some(42)").asInstanceOf[Option[Int]].get)
+    println(e.eval(new java.io.StringReader("42")))
   }
 }