commit 36979614627b71826bcbb136c920405a38550e6e
author Francois-Rene Rideau <tunes@google.com> Mon Apr 13 22:45:18 2015 +0000
committer Philipp Wollermann <philwo@google.com> Tue Apr 14 14:32:29 2015 +0000
tree e5ec114fa49207769bed078dde0c8f97655db1be
parent cbebfc7222cf0f1ded7461eac6b75bf6f698dc21

Shrink EvaluationContext a bit

Move some functionality to its only current client SkylarkShell,
mark some accessor @VisibleForTesting and remove those not currently used for testing.

--
MOS_MIGRATED_REVID=91033050

src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java
index 96ebf02..f00d8f5 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java
@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.lib.syntax;
 
+import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.rules.SkylarkModules;
 
 import java.io.BufferedReader;
@@ -31,14 +33,21 @@
   private static final String START_PROMPT = ">> ";
   private static final String CONTINUATION_PROMPT = ".. ";
 
+  public static final EventHandler PRINT_HANDLER = new EventHandler() {
+      @Override
+      public void handle(Event event) {
+        System.out.println(event.getMessage());
+      }
+    };
+
   private final BufferedReader reader = new BufferedReader(
       new InputStreamReader(System.in, Charset.defaultCharset()));
   private final EvaluationContext ev =
-      SkylarkModules.newEvaluationContext(EvaluationContext.PRINT_HANDLER);
+      SkylarkModules.newEvaluationContext(PRINT_HANDLER);
 
   public String read() {
     StringBuilder input = new StringBuilder();
-    ev.print(START_PROMPT);
+    System.out.print(START_PROMPT);
     try {
       while (true) {
         String line = reader.readLine();
@@ -49,7 +58,7 @@
           return input.toString();
         }
         input.append("\n").append(line);
-        ev.print(CONTINUATION_PROMPT);
+        System.out.print(CONTINUATION_PROMPT);
       }
     } catch (IOException io) {
       io.printStackTrace();
@@ -61,7 +70,10 @@
     String input;
     while ((input = read()) != null) {
       try {
-        ev.println(EvalUtils.prettyPrintValue(ev.eval(input)));
+        Object result = ev.eval(input);
+        if (result != null) {
+          System.out.println(EvalUtils.prettyPrintValue(result));
+        }
       } catch (Exception e) {
         e.printStackTrace();
       }