commit bd9576a7b092114b02118c2d08c2d6ef60806858
author Laurent Le Brun <laurentlb@google.com> Fri Nov 18 15:10:51 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Mon Nov 21 19:34:10 2016 +0000
tree 1e76272dd38e41f81409d5c1b32fc0728d6e8c66
parent 3613c776abcef65173f03c5bf1c80d44c0cf352e

Move Bazel-specific functions in a separate file.

"type", "set" and "select" should not be part of the standalone Skylark
library.

--
MOS_MIGRATED_REVID=139578095

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 f303082..cf0f85b 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
@@ -141,11 +141,8 @@
             "range",
             "repr",
             "reversed",
-            "select",
-            "set",
             "sorted",
             "str",
-            "type",
             "zip"),
         outerEnv.getVariableNames());
     assertEquals(
@@ -176,11 +173,8 @@
             "range",
             "repr",
             "reversed",
-            "select",
-            "set",
             "sorted",
             "str",
-            "type",
             "zip"),
         innerEnv.getVariableNames());
   }

src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
index b0ddd2f71..8d72a03 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -24,6 +24,7 @@
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.events.util.EventCollectionApparatus;
+import com.google.devtools.build.lib.syntax.BazelLibrary;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Environment.Phase;
 import com.google.devtools.build.lib.syntax.EvalException;
@@ -69,7 +70,7 @@
   public Environment newBuildEnvironment() {
     Environment env =
         Environment.builder(mutability)
-            .setGlobals(Environment.DEFAULT_GLOBALS)
+            .setGlobals(BazelLibrary.GLOBALS)
             .setEventHandler(getEventHandler())
             .setPhase(Phase.LOADING)
             .build();
@@ -84,7 +85,7 @@
   public Environment newSkylarkEnvironment() {
     return Environment.builder(mutability)
         .setSkylark()
-        .setGlobals(Environment.DEFAULT_GLOBALS)
+        .setGlobals(BazelLibrary.GLOBALS)
         .setEventHandler(getEventHandler())
         .build();
   }

src/test/java/com/google/devtools/build/lib/testutil/TestMode.java

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
index b239f1b..178e775 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.testutil;
 
 import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.syntax.BazelLibrary;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Mutability;
 
@@ -27,8 +28,7 @@
         @Override
         public Environment createEnvironment(EventHandler eventHandler, Environment environment) {
           return Environment.builder(Mutability.create("build test"))
-              .setGlobals(
-                  environment == null ? Environment.DEFAULT_GLOBALS : environment.getGlobals())
+              .setGlobals(environment == null ? BazelLibrary.GLOBALS : environment.getGlobals())
               .setEventHandler(eventHandler)
               .build();
         }
@@ -40,8 +40,7 @@
         public Environment createEnvironment(EventHandler eventHandler, Environment environment) {
           return Environment.builder(Mutability.create("skylark test"))
               .setSkylark()
-              .setGlobals(
-                  environment == null ? Environment.DEFAULT_GLOBALS : environment.getGlobals())
+              .setGlobals(environment == null ? BazelLibrary.GLOBALS : environment.getGlobals())
               .setEventHandler(eventHandler)
               .build();
         }