aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Laurent Le Brun <laurentlb@google.com>2016-10-26 14:25:37 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2016-10-27 09:23:42 +0000
commit4db50640e3799c528b1c893c431227d5d5c192a3 (patch)
tree7a765aa9033c928ed1b78e022710ddbf0244377b
parent0e40d5c26612c0acae9f1f0fee58f40e5d31dcc8 (diff)
Cleanup: remove isSkylark in Environment Continuation
-- MOS_MIGRATED_REVID=137272887
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/Environment.java13
1 files changed, 3 insertions, 10 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 35e87e2469..aeb018ff8b 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
@@ -213,24 +213,19 @@ public final class Environment implements Freezable {
/** The set of known global variables of the caller. */
@Nullable Set<String> knownGlobalVariables;
- /** Whether the caller is in Skylark mode. */
- boolean isSkylark;
-
Continuation(
Continuation continuation,
BaseFunction function,
FuncallExpression caller,
Frame lexicalFrame,
Frame globalFrame,
- Set<String> knownGlobalVariables,
- boolean isSkylark) {
+ Set<String> knownGlobalVariables) {
this.continuation = continuation;
this.function = function;
this.caller = caller;
this.lexicalFrame = lexicalFrame;
this.globalFrame = globalFrame;
this.knownGlobalVariables = knownGlobalVariables;
- this.isSkylark = isSkylark;
}
}
@@ -371,12 +366,11 @@ public final class Environment implements Freezable {
*/
void enterScope(BaseFunction function, FuncallExpression caller, Frame globals) {
continuation =
- new Continuation(continuation, function, caller, lexicalFrame, globalFrame,
- knownGlobalVariables, isSkylark);
+ new Continuation(
+ continuation, function, caller, lexicalFrame, globalFrame, knownGlobalVariables);
lexicalFrame = new Frame(mutability(), null);
globalFrame = globals;
knownGlobalVariables = new HashSet<>();
- isSkylark = true;
}
/**
@@ -387,7 +381,6 @@ public final class Environment implements Freezable {
lexicalFrame = continuation.lexicalFrame;
globalFrame = continuation.globalFrame;
knownGlobalVariables = continuation.knownGlobalVariables;
- isSkylark = continuation.isSkylark;
continuation = continuation.continuation;
}