Checker and parser changes to support two variable comprehensions for remaining Macros

PiperOrigin-RevId: 797505479

Author: maskri17

checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

@@ -800,7 +800,12 @@ public void twoVarComprehensions() throws Exception {
         "x.map_string_string.all(i, v, i < v) "
             + "&& x.repeated_int64.all(i, v, i < v) "
             + "&& [1, 2, 3, 4].all(i, v, i < 5 && v > 0) "
-            + "&& {'a': 1, 'b': 2}.all(k, v, k.startsWith('a') && v == 1)";
+            + "&& {'a': 1, 'b': 2}.all(k, v, k.startsWith('a') && v == 1) "
+            + "&& x.map_string_string.exists(i, v, i < v) "
+            + "&& [-1,2,3].exists_one(i,v,i>v) "
+            + "&& [1, 2, 3].transformList(i, v, i > 0 && v < 3, (i * v) + v) == [4] "
+            + "&& [1, 2, 3].transformList(i, v, i % 2 == 0, (i * v) + v) == [1,9] "
+            + "&& [1, 2, 3].transformList(i, v, (i * v) + v) == [1,4,9]";
     runTest();
   }
 
@@ -812,6 +817,18 @@ public void twoVarComprehensionsErrors() throws Exception {
     runTest();
   }
 
+  @Test
+  public void twoVarCompreIncorrectArgsErrors() throws Exception {
+    CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
+    declareVariable("x", messageType);
+    source =
+        "x.repeated_int64.exists(i, i, i < v) "
+            + "&& [1, 2, 3, 4].exists(i, v, i < v, v) "
+            + "&& x.map_string_string.exists_one(i, i < v) "
+            + "&& [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]";
+    runTest();
+  }
+
   @Test
   public void quantifiersErrors() throws Exception {
     CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");

checker/src/test/resources/twoVarCompreIncorrectArgsErrors.baseline

@@ -0,0 +1,35 @@
+Source: x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+declare x {
+  value cel.expr.conformance.proto3.TestAllTypes
+}
+=====>
+ERROR: test_location:1:1: overlapping declaration name 'i' (type 'int' cannot be distinguished from 'int')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ^
+ERROR: test_location:1:35: undeclared reference to 'v' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ..................................^
+ERROR: test_location:1:60: undeclared reference to 'exists' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ...........................................................^
+ERROR: test_location:1:61: undeclared reference to 'i' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ............................................................^
+ERROR: test_location:1:64: undeclared reference to 'v' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ...............................................................^
+ERROR: test_location:1:67: undeclared reference to 'i' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ..................................................................^
+ERROR: test_location:1:71: undeclared reference to 'v' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ......................................................................^
+ERROR: test_location:1:74: undeclared reference to 'v' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | .........................................................................^
+ERROR: test_location:1:118: undeclared reference to 'v' (in container '')
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | .....................................................................................................................^
+ERROR: test_location:1:165: found no matching overload for '_<_' applied to '(cel.expr.conformance.proto3.TestAllTypes, int)' (candidates: (bool, bool),(int, int),(uint, uint),(double, double),(string, string),(bytes, bytes),(google.protobuf.Timestamp, google.protobuf.Timestamp),(google.protobuf.Duration, google.protobuf.Duration),(int, uint),(uint, int),(int, double),(double, int),(uint, double),(double, uint))
+ | x.repeated_int64.exists(i, i, i < v) && [1, 2, 3, 4].exists(i, v, i < v, v) && x.map_string_string.exists_one(i, i < v) && [1, 2, 3].transformList(i, v, i > 0 && x < 3, (i * v) + v) == [4]
+ | ....................................................................................................................................................................^