diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java | 4 |
1 files changed, 2 insertions, 2 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 7619d67d43..7ba3d24282 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 @@ -262,7 +262,7 @@ public final class BinaryOperatorExpression extends Expression { if (lval instanceof List<?> && rval instanceof List<?>) { List<?> llist = (List<?>) lval; List<?> rlist = (List<?>) rval; - if (EvalUtils.isImmutable(llist) != EvalUtils.isImmutable(rlist)) { + if (EvalUtils.isTuple(llist) != EvalUtils.isTuple(rlist)) { throw new EvalException(getLocation(), "can only concatenate " + EvalUtils.getDataTypeName(rlist) + " (not \"" + EvalUtils.getDataTypeName(llist) + "\") to " + EvalUtils.getDataTypeName(rlist)); @@ -273,7 +273,7 @@ public final class BinaryOperatorExpression extends Expression { List<Object> result = Lists.newArrayListWithCapacity(llist.size() + rlist.size()); result.addAll(llist); result.addAll(rlist); - return EvalUtils.makeSequence(result, EvalUtils.isImmutable(llist)); + return EvalUtils.makeSequence(result, EvalUtils.isTuple(llist)); } } |