Rename isSkylarkEnabled to isSkylark

--
MOS_MIGRATED_REVID=101518833

8 files changed, 12 insertions, 12 deletions

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 5722e7df61..5357d4d4db 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
@@ -147,7 +147,7 @@ public class Environment {
     update("None", NONE);
   }
 
-  public boolean isSkylarkEnabled() {
+  public boolean isSkylark() {
     return false;
   }
 
@@ -296,7 +296,7 @@ public class Environment {
     }
 
     Object value = importedExtensions.get(extension).lookup(nameInLoadedFile);
-    if (!isSkylarkEnabled()) {
+    if (!isSkylark()) {
       value = SkylarkType.convertFromSkylark(value);
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java b/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java
index f91222c740..c508309a6f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvaluationContext.java
@@ -108,7 +108,7 @@ public final class EvaluationContext {
 
   /** Is this a Skylark evaluation context? */
   public boolean isSkylark() {
-    return env.isSkylarkEnabled();
+    return env.isSkylark();
   }
 
   /** Parse a string without a supporting file, returning statements and comments */
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 32fda83eb4..5ebaa0ee00 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 @@ public final class FuncallExpression extends Expression {
       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 @@ public final class FuncallExpression extends Expression {
 
   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);
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/LValue.java b/src/main/java/com/google/devtools/build/lib/syntax/LValue.java
index 095a803df6..df5f486e0b 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/LValue.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/LValue.java
@@ -81,7 +81,7 @@ public class LValue implements Serializable {
       throws EvalException, InterruptedException {
     Preconditions.checkNotNull(result, "trying to assign null to %s", ident);
 
-    if (env.isSkylarkEnabled()) {
+    if (env.isSkylark()) {
       // The variable may have been referenced successfully if a global variable
       // with the same name exists. In this case an Exception needs to be thrown.
       SkylarkEnvironment skylarkEnv = (SkylarkEnvironment) env;
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java b/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java
index 2e905b774d..5dc7a1cbb0 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java
@@ -219,7 +219,7 @@ public final class ListComprehension extends Expression {
   Object eval(Environment env) throws EvalException, InterruptedException {
     List<Object> result = new ArrayList<>();
     evalStep(env, result, 0);
-    return env.isSkylarkEnabled() ? SkylarkList.list(result, getLocation()) : result;
+    return env.isSkylark() ? SkylarkList.list(result, getLocation()) : result;
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java b/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java
index d9be907c79..da6e10c00f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java
@@ -107,7 +107,7 @@ public final class ListLiteral extends Expression {
       }
       result.add(expr.eval(env));
     }
-    if (env.isSkylarkEnabled()) {
+    if (env.isSkylark()) {
       return isTuple()
           ? SkylarkList.tuple(result) : SkylarkList.list(result, getLocation());
     } else {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
index a1aebbb026..e7cbf90a57 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
@@ -818,7 +818,7 @@ public class MethodLibrary {
       List<Object> list = Lists.newArrayListWithCapacity(dict.size());
       for (Map.Entry<?, ?> entries : dict.entrySet()) {
         List<?> item = ImmutableList.of(entries.getKey(), entries.getValue());
-        list.add(env.isSkylarkEnabled() ? SkylarkList.tuple(item) : item);
+        list.add(env.isSkylark() ? SkylarkList.tuple(item) : item);
       }
         return convert(list, env, loc);
       }
@@ -864,7 +864,7 @@ public class MethodLibrary {
   @SuppressWarnings("unchecked")
   private static Iterable<Object> convert(Collection<?> list, Environment env, Location loc)
       throws EvalException {
-    if (env.isSkylarkEnabled()) {
+    if (env.isSkylark()) {
       return SkylarkList.list(list, loc);
     } else {
       return Lists.newArrayList(list);
@@ -1419,7 +1419,7 @@ public class MethodLibrary {
     env.registerFunction(List.class, indexOperator.getName(), indexOperator);
     env.registerFunction(ImmutableList.class, indexOperator.getName(), indexOperator);
 
-    if (env.isSkylarkEnabled()) {
+    if (env.isSkylark()) {
       setupMethodEnvironment(env, skylarkGlobalFunctions);
     } else {
       // TODO(bazel-team): listFunctions are not allowed in Skylark extensions (use += instead).
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkEnvironment.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkEnvironment.java
index f9e1e30eb0..c2923896fb 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkEnvironment.java
@@ -154,7 +154,7 @@ public class SkylarkEnvironment extends Environment implements Serializable {
   }
 
   @Override
-  public boolean isSkylarkEnabled() {
+  public boolean isSkylark() {
     return true;
   }