commit 1afb0b24ca35028bf994083d909ac9bf1776ba18
author Laurent Le Brun <laurentlb@google.com> Wed Oct 26 12:46:42 2016 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Thu Oct 27 09:22:51 2016 +0000
tree ea387d8d0bb5afc2e2e1293b00df374bc4b34ee9
parent 6a3565e0d7179bc66879a3e77b7eb745b539733c

Cleanup in Environment, remove unused lookup function

--
MOS_MIGRATED_REVID=137266170

src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 5990ea3..189cc15 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -1765,7 +1765,7 @@
           continue;
         }
         String target = ((Identifier) lvalue).getName();
-        if (pkgEnv.lookup(target, null) != null) {
+        if (pkgEnv.hasVariable(target)) {
           eventHandler.handle(Event.error(stmt.getLocation(), "Reassignment of builtin build "
               + "function '" + target + "' not permitted"));
           return false;

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index fe9b209..35e87e2 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -698,7 +698,7 @@
     return this;
   }
 
-  private boolean hasVariable(String varname) {
+  public boolean hasVariable(String varname) {
     return lookup(varname) != null;
   }
 
@@ -757,19 +757,6 @@
   }
 
   /**
-   * Like {@link #lookup(String)}, but instead of throwing an exception in the case
-   * where <code>varname</code> is not defined, <code>defaultValue</code> is returned instead.
-   */
-  public Object lookup(String varname, Object defaultValue) {
-    Preconditions.checkState(!isSkylark);
-    Object value = lookup(varname);
-    if (value != null) {
-      return value;
-    }
-    return defaultValue;
-  }
-
-  /**
    * @return true if varname is a known global variable,
    * because it has been read in the context of the current function.
    */

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

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
index 1e8ae71..6c8cbd7 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
@@ -47,10 +47,10 @@
   }
 
   @Test
-  public void testLookupWithDefault() throws Exception {
-    assertEquals(21, getEnvironment().lookup("VERSION", 21));
+  public void testHasVariable() throws Exception {
+    assertThat(getEnvironment().hasVariable("VERSION")).isFalse();
     update("VERSION", 42);
-    assertEquals(42, getEnvironment().lookup("VERSION", 21));
+    assertThat(getEnvironment().hasVariable("VERSION")).isTrue();
   }
 
   @Test