- Fixed to use scala.runtime.InterpreterSupport...

- Fixed to use scala.runtime.InterpreterSupport instead of
scala.Interpreter

1 files changed, 12 insertions, 11 deletions

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index 626d9f517f..8aac110889 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -292,28 +292,23 @@ public class  Global {
     public static final String CONSOLE_S = "$console$";
     private static final Name
         CONSOLE_N               = Name.fromString(CONSOLE_S),
-        INTERPRETER_N           = Name.fromString("Interpreter"),
-        SCALA_INTERPRETER_N     = Name.fromString("scala.Interpreter"),
+        INTERPRETER_N           = Name.fromString("scala.runtime.InterpreterSupport"),
         SHOW_DEFINITION_N       = Name.fromString("showDefinition"),
         SHOW_VALUE_DEFINITION_N = Name.fromString("showValueDefinition"),
-        SHOW_VALUE_N            = Name.fromString("showValue");
+        SET_EVALUATION_RESULT_N = Name.fromString("setEvaluationResult");
     private Symbol INTERPRETER;
+    private Symbol PRINTER;
     private Symbol SHOW_VALUE;
+    private Symbol SET_EVALUATION_RESULT;
     private Symbol SHOW_DEFINITION;
     private Symbol SHOW_VALUE_DEFINITION;
 
     private Symbol INTERPRETER() {
         if (INTERPRETER == null)
-            INTERPRETER = definitions.getModule(SCALA_INTERPRETER_N);
+            INTERPRETER = definitions.getModule(INTERPRETER_N);
         return INTERPRETER;
     }
 
-    private Symbol SHOW_VALUE() {
-        if (SHOW_VALUE == null)
-            SHOW_VALUE = INTERPRETER().lookup(SHOW_VALUE_N);
-        return SHOW_VALUE;
-    }
-
     private Symbol SHOW_DEFINITION() {
         if (SHOW_DEFINITION == null)
             SHOW_DEFINITION = INTERPRETER().lookup(SHOW_DEFINITION_N);
@@ -326,6 +321,12 @@ public class  Global {
         return SHOW_VALUE_DEFINITION;
     }
 
+    private Symbol SET_EVALUATION_RESULT() {
+        if (SET_EVALUATION_RESULT == null)
+            SET_EVALUATION_RESULT = INTERPRETER().lookup(SET_EVALUATION_RESULT_N);
+        return SET_EVALUATION_RESULT;
+    }
+
     private int module = 0;
     private List imports = new ArrayList();
 
@@ -372,7 +373,7 @@ public class  Global {
                         treeGen.Apply(
                             treeGen.Select(
                                 treeGen.mkRef(0, INTERPRETER()),
-                                SHOW_VALUE()),
+                                SET_EVALUATION_RESULT()),
                             new Tree[] {
                                 last,
                                 make.Literal(0, show(last.type())).setType(