commit 8d966f7540518c7f67764bb7bd3ec03825501f4b
author Laurent Le Brun <laurentlb@google.com> Wed Apr 15 18:47:34 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Apr 16 18:35:44 2015 +0000
tree 8dc680f45d1a5184eb91b21631e7b05f9b925bc0
parent f07f47c5fb3e9e1935ef12c4f1671f78b235bfa3

Cleanup in ValidationEnvironment wrt to user-defined functions

--
MOS_MIGRATED_REVID=91216722

src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java b/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java
index 366cf6e..2bbdbbb 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java
@@ -17,7 +17,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.events.Location;
-import com.google.devtools.build.lib.syntax.SkylarkType.SkylarkFunctionType;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -45,9 +44,6 @@
   // branches of if-else statements.
   private Stack<Set<String>> futureReadOnlyVariables = new Stack<>();
 
-  // The function we are currently validating.
-  private SkylarkFunctionType currentFunction;
-
   // Whether this validation environment is not modified therefore clonable or not.
   private boolean clonable;
 
@@ -85,11 +81,10 @@
   /**
    * Creates a local ValidationEnvironment to validate user defined function bodies.
    */
-  public ValidationEnvironment(ValidationEnvironment parent, SkylarkFunctionType currentFunction) {
+  public ValidationEnvironment(ValidationEnvironment parent) {
     // Don't copy readOnlyVariables: Variables may shadow global values.
     this.parent = parent;
     this.variableTypes = new HashMap<String, SkylarkType>();
-    this.currentFunction = currentFunction;
     this.clonable = false;
   }
 
@@ -132,40 +127,11 @@
         || topLevel().variableTypes.containsKey(varname);
   }
 
-  /**
-   * Returns the type of the existing variable.
-   */
-  public SkylarkType getVartype(String varname) {
-    SkylarkType type = variableTypes.get(varname);
-    if (type == null && parent != null) {
-      type = parent.getVartype(varname);
-    }
-    return Preconditions.checkNotNull(type,
-        String.format("Variable %s is not found in the validation environment", varname));
-  }
-
-  public SkylarkFunctionType getCurrentFunction() {
-    return currentFunction;
-  }
-
   private ValidationEnvironment topLevel() {
     return Preconditions.checkNotNull(parent == null ? this : parent);
   }
 
   /**
-   * Adds a user defined function to the validation environment is not exists.
-   */
-  public void updateFunction(String name, SkylarkFunctionType type, Location loc)
-      throws EvalException {
-    checkReadonly(name, loc);
-    if (variableTypes.containsKey(name)) {
-      throw new EvalException(loc, "function " + name + " already exists");
-    }
-    variableTypes.put(name, type);
-    clonable = false;
-  }
-
-  /**
    * Starts a session with temporarily disabled readonly checking for variables between branches.
    * This is useful to validate control flows like if-else when we know that certain parts of the
    * code cannot both be executed.