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

1 files changed, 4 insertions, 32 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java b/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java
index 8ccca055d5..4966fb8717 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java
@@ -57,13 +57,6 @@ public final class EvaluationContext {
       }
     };
 
-  public static final EventHandler PRINT_HANDLER = new EventHandler() {
-      @Override
-      public void handle(Event event) {
-        System.out.print(event.getMessage());
-      }
-    };
-
   public static EvaluationContext newBuildContext(EventHandler eventHandler, Environment env,
       boolean parsePython) {
     return new EvaluationContext(eventHandler, env, null, parsePython);
@@ -86,21 +79,14 @@ public final class EvaluationContext {
     return newSkylarkContext(new SkylarkEnvironment(eventHandler), new ValidationEnvironment());
   }
 
+  /** Base context for Skylark evaluation for internal use only, while initializing builtins */
+  static final EvaluationContext SKYLARK_INITIALIZATION = newSkylarkContext(FAIL_FAST_HANDLER);
+
+  @VisibleForTesting
   public Environment getEnvironment() {
     return env;
   }
 
-  public EventHandler getEventHandler() {
-    return eventHandler;
-  }
-
-  public ValidationEnvironment getValidationEnvironment() {
-    return validationEnv;
-  }
-
-  /** Base context for Skylark evaluation for internal use only, while initializing builtins */
-  static final EvaluationContext SKYLARK_INITIALIZATION = newSkylarkContext(FAIL_FAST_HANDLER);
-
   /** Mock package locator */
   private static final class EmptyPackageLocator implements CachingPackageLocator {
     @Override
@@ -201,20 +187,6 @@ public final class EvaluationContext {
     return env.lookup(varname);
   }
 
-  /** Print a String in this context */
-  public void print(String msg) {
-    if (msg != null) {
-      eventHandler.handle(new Event(EventKind.STDOUT, null, msg));
-    }
-  }
-
-  /** Print a String in this context */
-  public void println(String msg) {
-    if (msg != null) {
-      print(msg + "\n");
-    }
-  }
-
   /** Evaluate a series of statements */
   public Object eval(String... input) throws EvalException, InterruptedException {
     return eval(parseFile(input));