commit 5e99198c66443e0298b406212c1e80a55fc729aa
author Laurent Le Brun <laurentlb@google.com> Fri Oct 14 13:39:45 2016 +0000
committer Yun Peng <pcloudy@google.com> Fri Oct 14 20:24:36 2016 +0000
tree 24d07c8be044839bf9fea05d9751c70ad14804c1
parent f50e6691da8aa685f31165c66a245b85f68abf06

Cleanup, remove differences between Build and Skylark environments.

The only visible difference for users is that a few more functions are
available in BUILD files. That's fine, this difference was not even
documented.

RELNOTES:
  A few functions are added to BUILD files for consistency (hash, dir,
  hasattr, getattr) with .bzl files, although they are not very useful.

--
MOS_MIGRATED_REVID=136151633

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 d03aa27..fe9b209 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
@@ -875,11 +875,11 @@
   /** A read-only Environment.Frame with global constants in it only */
   static final Frame CONSTANTS_ONLY = createConstantsGlobals();
 
-  /** A read-only Environment.Frame with initial globals for the BUILD language */
-  public static final Frame BUILD = createBuildGlobals();
+  /** A read-only Environment.Frame with initial globals */
+  public static final Frame DEFAULT_GLOBALS = createDefaultGlobals();
 
-  /** A read-only Environment.Frame with initial globals for Skylark */
-  public static final Frame SKYLARK = createSkylarkGlobals();
+  /** To be removed when all call-sites are updated. */
+  public static final Frame SKYLARK = DEFAULT_GLOBALS;
 
   private static Environment.Frame createConstantsGlobals() {
     try (Mutability mutability = Mutability.create("CONSTANTS")) {
@@ -889,20 +889,11 @@
     }
   }
 
-  private static Environment.Frame createBuildGlobals() {
+  private static Environment.Frame createDefaultGlobals() {
     try (Mutability mutability = Mutability.create("BUILD")) {
       Environment env = Environment.builder(mutability).build();
       Runtime.setupConstants(env);
-      Runtime.setupMethodEnvironment(env, MethodLibrary.buildGlobalFunctions);
-      return env.getGlobals();
-    }
-  }
-
-  private static Environment.Frame createSkylarkGlobals() {
-    try (Mutability mutability = Mutability.create("SKYLARK")) {
-      Environment env = Environment.builder(mutability).setSkylark().build();
-      Runtime.setupConstants(env);
-      Runtime.setupMethodEnvironment(env, MethodLibrary.skylarkGlobalFunctions);
+      Runtime.setupMethodEnvironment(env, MethodLibrary.defaultGlobalFunctions);
       return env.getGlobals();
     }
   }