aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java
diff options
context:
space:
mode:
authorGravatar Vladimir Moskva <vladmos@google.com>2016-11-07 18:32:59 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-11-08 09:14:03 +0000
commitdbb3487f71cc15bcb5f1addec6d103983088ff48 (patch)
tree7455c60a86a58b96f05f21705fefe432c22177ae /src/main/java
parent51e4817848eabe85529118a0188ffc30d0bbc6e5 (diff)
Prohibited comparison of Skylark sets
RELNOTES: Comparing sets (`if set1 < set2:`) is not allowed anymore in Skylark because it didn't work correctly anyway. -- MOS_MIGRATED_REVID=138408411
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index 29667813ad..f9f2f62a88 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -72,6 +72,9 @@ public final class EvalUtils {
o1 = SkylarkType.convertToSkylark(o1, /*env=*/ null);
o2 = SkylarkType.convertToSkylark(o2, /*env=*/ null);
+ if (o1 instanceof SkylarkNestedSet && o2 instanceof SkylarkNestedSet) {
+ throw new ComparisonException("Cannot compare sets");
+ }
if (o1 instanceof SkylarkList && o2 instanceof SkylarkList
&& ((SkylarkList) o1).isTuple() == ((SkylarkList) o2).isTuple()) {
return compareLists((SkylarkList) o1, (SkylarkList) o2);