commit 22aab6d741c4a432e5ecb6b865866f403a21bc18
author Francois-Rene Rideau <tunes@google.com> Tue Aug 25 22:55:31 2015 +0000
committer Lukacs Berki <lberki@google.com> Wed Aug 26 07:41:23 2015 +0000
tree 4712d6cbadfb79c844fc4d9d257268d91e3c62fa
parent 706bc72fa9dfe8b1a02558f6f177e547b98155b5

Rename isSkylarkEnabled to isSkylark

--
MOS_MIGRATED_REVID=101518833

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
index 32fda83..5ebaa0e 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
@@ -516,7 +516,7 @@
       return convertFromSkylark(
           function.call(posargs.build(), ImmutableMap.<String, Object>copyOf(kwargs), this, env),
           env);
-    } else if (env.isSkylarkEnabled()) {
+    } else if (env.isSkylark()) {
       // Only allow native Java calls when using Skylark
       // When calling a Java method, the name is not in the Environment,
       // so evaluating 'func' would fail.
@@ -567,7 +567,7 @@
 
   protected Object convertFromSkylark(Object returnValue, Environment env) throws EvalException {
     EvalUtils.checkNotNull(this, returnValue);
-    if (!env.isSkylarkEnabled()) {
+    if (!env.isSkylark()) {
       // The call happens in the BUILD language. Note that accessing "BUILD language" functions in
       // Skylark should never happen.
       return SkylarkType.convertFromSkylark(returnValue);