commit a3421e204f22e478382bb8487b96df9dcd8e463a
author Googler <noreply@google.com> Thu Sep 26 06:48:32 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 26 06:49:29 2019 -0700
tree 374e8f47350cd4bc4d65d8e2e30a9f70ba653283
parent 8108d1ab27c819752dc08391e2e355acc714856c

bazel syntax: rename Environment -> StarlarkThread

The environment features are about to be removed.

This is inevitably a breaking API change (sorry copybara).

PiperOrigin-RevId: 271339546

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
index 8af2052..5887f00 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
@@ -21,8 +21,8 @@
 import com.google.devtools.build.lib.profiler.SilentCloseable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkSignature;
-import com.google.devtools.build.lib.syntax.Environment.LexicalFrame;
 import com.google.devtools.build.lib.syntax.SkylarkType.SkylarkFunctionType;
+import com.google.devtools.build.lib.syntax.StarlarkThread.LexicalFrame;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -133,9 +133,9 @@
 
   @Override
   @Nullable
-  public Object call(Object[] args, @Nullable FuncallExpression ast, Environment env)
+  public Object call(Object[] args, @Nullable FuncallExpression ast, StarlarkThread thread)
       throws EvalException, InterruptedException {
-    Preconditions.checkNotNull(env);
+    Preconditions.checkNotNull(thread);
 
     // ast is null when called from Java (as there's no Skylark call site).
     Location loc = ast == null ? Location.BUILTIN : ast.getLocation();
@@ -154,7 +154,7 @@
             break;
 
           case ENVIRONMENT:
-            args[i] = env;
+            args[i] = thread;
             break;
         }
         i++;
@@ -164,7 +164,8 @@
     // Last but not least, actually make an inner call to the function with the resolved arguments.
     try (SilentCloseable c =
         Profiler.instance().profile(ProfilerTask.STARLARK_BUILTIN_FN, getName())) {
-      env.enterScope(this, SHARED_LEXICAL_FRAME_FOR_BUILTIN_FUNCTION_CALLS, ast, env.getGlobals());
+      thread.enterScope(
+          this, SHARED_LEXICAL_FRAME_FOR_BUILTIN_FUNCTION_CALLS, ast, thread.getGlobals());
       return invokeMethod.invoke(this, args);
     } catch (InvocationTargetException x) {
       Throwable e = x.getCause();
@@ -201,7 +202,7 @@
     } catch (IllegalAccessException e) {
       throw badCallException(loc, e, args);
     } finally {
-      env.exitScope();
+      thread.exitScope();
     }
   }
 
@@ -360,7 +361,7 @@
     }
 
     @Override
-    public Object call(Object[] args, @Nullable FuncallExpression ast, Environment env)
+    public Object call(Object[] args, @Nullable FuncallExpression ast, StarlarkThread thread)
         throws EvalException {
       throw new EvalException(null, "tried to invoke a Factory for function " + this);
     }