aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/syntax
diff options
context:
space:
mode:
authorGravatar vladmos <vladmos@google.com>2017-12-08 03:07:47 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2017-12-08 03:09:20 -0800
commitc5301e919c990ab2e87bac9abde003202c966e8a (patch)
tree4267ed4960ad08d6cd8a86da811b555661c82406 /src/main/java/com/google/devtools/build/lib/syntax
parentc1914135477581163560c00a3a728d37ad0ea846 (diff)
Remove the --incompatible_list_plus_equals_inplace flag
RELNOTES[INC]: The flag --incompatible_list_plus_equals_inplace is removed, its default behavior is preserved. += on lists now always mutates the left hand side. PiperOrigin-RevId: 178359047
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java6
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java3
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
index 450db7728a..d8985586c1 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
@@ -211,7 +211,7 @@ public final class BinaryOperatorExpression extends Expression {
return divide(lhs, rhs, location);
case PERCENT:
- return percent(lhs, rhs, env, location);
+ return percent(lhs, rhs, location);
case EQUALS_EQUALS:
return lhs.equals(rhs);
@@ -293,7 +293,7 @@ public final class BinaryOperatorExpression extends Expression {
}
if ((lval instanceof MutableList) && (rval instanceof MutableList)) {
- if (isAugmented && env.getSemantics().incompatibleListPlusEqualsInplace()) {
+ if (isAugmented) {
@SuppressWarnings("unchecked")
MutableList<Object> list = (MutableList) lval;
list.addAll((MutableList<?>) rval, location, env.mutability());
@@ -420,7 +420,7 @@ public final class BinaryOperatorExpression extends Expression {
}
/** Implements Operator.PERCENT. */
- private static Object percent(Object lval, Object rval, Environment env, Location location)
+ private static Object percent(Object lval, Object rval, Location location)
throws EvalException {
// int % int
if (lval instanceof Integer && rval instanceof Integer) {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
index 7f6f6c6018..c0ebebe974 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -51,7 +51,6 @@ public abstract class SkylarkSemantics {
public abstract boolean incompatibleDisallowKeywordOnlyArgs();
public abstract boolean incompatibleDisallowToplevelIfStatement();
public abstract boolean incompatibleDisallowUncalledSetConstructor();
- public abstract boolean incompatibleListPlusEqualsInplace();
public abstract boolean incompatibleLoadArgumentIsLabel();
public abstract boolean incompatibleNewActionsApi();
public abstract boolean incompatibleShowAllPrintMessages();
@@ -84,7 +83,6 @@ public abstract class SkylarkSemantics {
.incompatibleDisallowKeywordOnlyArgs(true)
.incompatibleDisallowToplevelIfStatement(true)
.incompatibleDisallowUncalledSetConstructor(true)
- .incompatibleListPlusEqualsInplace(true)
.incompatibleLoadArgumentIsLabel(true)
.incompatibleNewActionsApi(false)
.incompatibleShowAllPrintMessages(true)
@@ -110,7 +108,6 @@ public abstract class SkylarkSemantics {
public abstract Builder incompatibleDisallowKeywordOnlyArgs(boolean value);
public abstract Builder incompatibleDisallowToplevelIfStatement(boolean value);
public abstract Builder incompatibleDisallowUncalledSetConstructor(boolean value);
- public abstract Builder incompatibleListPlusEqualsInplace(boolean value);
public abstract Builder incompatibleLoadArgumentIsLabel(boolean value);
public abstract Builder incompatibleNewActionsApi(boolean value);
public abstract Builder incompatibleShowAllPrintMessages(boolean value);