Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Aug 19, 2025
Merged

Checker and parser changes to support comprehensionsV2 #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions checker/src/main/java/dev/cel/checker/ExprChecker.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
CelType accuType = env.getType(visitedInit);
CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
CelType varType;
CelType varType2 = null;
switch (rangeType.kind()) {
case LIST:
varType = ((ListType) rangeType).elemType();
if (!Strings.isNullOrEmpty(compre.iterVar2())) {
varType2 = varType;
varType = SimpleType.INT;
}
break;
case MAP:
// Ranges over the keys.
varType = ((MapType) rangeType).keyType();
if (!Strings.isNullOrEmpty(compre.iterVar2())) {
varType2 = ((MapType) rangeType).valueType();
}
break;
case DYN:
case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
// Declare iteration variable on inner scope.
env.enterScope();
env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
if (!Strings.isNullOrEmpty(compre.iterVar2())) {
env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
}
CelExpr condition = visit(compre.loopCondition());
assertType(condition, SimpleType.BOOL);
CelExpr visitedStep = visit(compre.loopStep());
Expand Down
20 changes: 20 additions & 0 deletions checker/src/test/java/dev/cel/checker/ExprCheckerTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
runTest();
}

@Test
public void twoVarComprehensions() throws Exception {
CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
declareVariable("x", messageType);
source =
"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)";
runTest();
}

@Test
public void twoVarComprehensionsErrors() throws Exception {
CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
declareVariable("x", messageType);
source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
runTest();
}

@Test
public void quantifiersErrors() throws Exception {
CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down
126 changes: 126 additions & 0 deletions checker/src/test/resources/twoVarComprehensions.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
_&&_(
__comprehension__(
// Variable
i,
v,
// Target
x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
// Accumulator
@result,
// Init
true~bool,
// LoopCondition
@not_strictly_false(
@result~bool^@result
)~bool^not_strictly_false,
// LoopStep
_&&_(
@result~bool^@result,
_<_(
i~string^i,
v~string^v
)~bool^less_string
)~bool^logical_and,
// Result
@result~bool^@result)~bool,
__comprehension__(
// Variable
i,
v,
// Target
x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
// Accumulator
@result,
// Init
true~bool,
// LoopCondition
@not_strictly_false(
@result~bool^@result
)~bool^not_strictly_false,
// LoopStep
_&&_(
@result~bool^@result,
_<_(
i~int^i,
v~int^v
)~bool^less_int64
)~bool^logical_and,
// Result
@result~bool^@result)~bool
)~bool^logical_and,
_&&_(
__comprehension__(
// Variable
i,
v,
// Target
[
1~int,
2~int,
3~int,
4~int
]~list(int),
// Accumulator
@result,
// Init
true~bool,
// LoopCondition
@not_strictly_false(
@result~bool^@result
)~bool^not_strictly_false,
// LoopStep
_&&_(
@result~bool^@result,
_&&_(
_<_(
i~int^i,
5~int
)~bool^less_int64,
_>_(
v~int^v,
0~int
)~bool^greater_int64
)~bool^logical_and
)~bool^logical_and,
// Result
@result~bool^@result)~bool,
__comprehension__(
// Variable
k,
v,
// Target
{
"a"~string:1~int,
"b"~string:2~int
}~map(string, int),
// Accumulator
@result,
// Init
true~bool,
// LoopCondition
@not_strictly_false(
@result~bool^@result
)~bool^not_strictly_false,
// LoopStep
_&&_(
@result~bool^@result,
_&&_(
k~string^k.startsWith(
"a"~string
)~bool^starts_with_string,
_==_(
v~int^v,
1~int
)~bool^equals
)~bool^logical_and
)~bool^logical_and,
// Result
@result~bool^@result)~bool
)~bool^logical_and
)~bool^logical_and
11 changes: 11 additions & 0 deletions checker/src/test/resources/twoVarComprehensionsErrors.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
| x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
| ..........................^
ERROR: test_location:1:71: The argument must be a simple name
| x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
| ......................................................................^
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/ast/CelExprFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
.build();
}

/** Fold creates a fold comprehension instruction. */
/** Fold creates a fold for one variable comprehension instruction. */
public final CelExpr fold(
String iterVar,
CelExpr iterRange,
Expand Down
5 changes: 5 additions & 0 deletions extensions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
name = "sets_function",
exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
name = "comprehensions",
exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)
15 changes: 15 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
],
deps = [
":bindings",
":comprehensions",
":encoders",
":lists",
":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
"@maven//:com_google_re2j_re2j",
],
)

java_library(
name = "comprehensions",
srcs = ["CelComprehensionsExtensions.java"],
deps = [
"//common:compiler_common",
"//common/ast",
"//compiler:compiler_builder",
"//parser:macro",
"//parser:operator",
"//parser:parser_builder",
"@maven//:com_google_guava_guava",
],
)
87 changes: 87 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
// TODO: Implement CelExtensionLibrary.FeatureSet interface.
public ImmutableSet<CelMacro> macros() {
return ImmutableSet.of(
CelMacro.newReceiverMacro(
Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
}

@Override
public void setParserOptions(CelParserBuilder parserBuilder) {
parserBuilder.addMacros(macros());
}

private static Optional<CelExpr> expandAllMacro(
CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
checkNotNull(exprFactory);
checkNotNull(target);
checkArgument(arguments.size() == 3);
CelExpr arg0 = checkNotNull(arguments.get(0));
if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
return Optional.of(reportArgumentError(exprFactory, arg0));
}
CelExpr arg1 = checkNotNull(arguments.get(1));
if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
return Optional.of(reportArgumentError(exprFactory, arg1));
}
CelExpr arg2 = checkNotNull(arguments.get(2));
CelExpr accuInit = exprFactory.newBoolLiteral(true);
CelExpr condition =
exprFactory.newGlobalCall(
Operator.NOT_STRICTLY_FALSE.getFunction(),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
CelExpr step =
exprFactory.newGlobalCall(
Operator.LOGICAL_AND.getFunction(),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
arg2);
CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
return Optional.of(
exprFactory.fold(
arg0.ident().name(),
arg1.ident().name(),
target,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
result));
}

private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
return exprFactory.reportError(
CelIssue.formatError(
exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
}
}
16 changes: 16 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/CelExtensions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
new CelComprehensionsExtensions();

/**
* Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
return REGEX_EXTENSIONS;
}

/**
* Extended functions for Two Variable Comprehensions Expressions.
*
* <p>Refer to README.md for available functions.
*
* <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
* including any future additions.
*/
// TODO: Remove visibility restrictions and make this public once the feature is
// ready.
private static CelComprehensionsExtensions comprehensions() {
return COMPREHENSIONS_EXTENSIONS;
}

/**
* Retrieves all function names used by every extension libraries.
*
Expand Down
1 change: 1 addition & 0 deletions parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
builder.setComprehension(
CelExpr.CelComprehension.newBuilder()
.setIterVar(expr.comprehension().iterVar())
.setIterVar2(expr.comprehension().iterVar2())
.setIterRange(copy(expr.comprehension().iterRange()))
.setAccuVar(expr.comprehension().accuVar())
.setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down
1 change: 1 addition & 0 deletions testing/src/main/java/dev/cel/testing/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
"//common/types:type_providers",
"//compiler",
"//compiler:compiler_builder",
"//extensions:comprehensions",
"//parser:macro",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Checker and parser changes to support comprehensionsV2#778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 19, 2025
 Merged


Checker and parser changes to support comprehensionsV2
#778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -510,13 +511,21 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 CelType accuType = env.getType(visitedInit);
 CelType rangeType = inferenceContext.specialize(env.getType(visitedRange));
 CelType varType;
 CelType varType2 = null;
 switch (rangeType.kind()) {
 case LIST:
 varType = ((ListType) rangeType).elemType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = varType;
 varType = SimpleType.INT;
 }
 break;
 case MAP:
 // Ranges over the keys.
 varType = ((MapType) rangeType).keyType();
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 varType2 = ((MapType) rangeType).valueType();
 }
 break;
 case DYN:
 case ERROR:
Expand DownExpand Up@@ -547,6 +556,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelComprehension compre) {
 // Declare iteration variable on inner scope.
 env.enterScope();
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar(), varType));
 if (!Strings.isNullOrEmpty(compre.iterVar2())) {
 env.add(CelIdentDecl.newIdentDeclaration(compre.iterVar2(), varType2));
 }
 CelExpr condition = visit(compre.loopCondition());
 assertType(condition, SimpleType.BOOL);
 CelExpr visitedStep = visit(compre.loopStep());
Expand Down

20 changes: 20 additions & 0 deletions
checker/src/test/java/dev/cel/checker/ExprCheckerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -792,6 +792,26 @@ public void quantifiers() throws Exception {
 runTest();
 }

 @Test
 public void twoVarComprehensions() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source =
 "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)";
 runTest();
 }

 @Test
 public void twoVarComprehensionsErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
 declareVariable("x", messageType);
 source = "x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)";
 runTest();
 }

 @Test
 public void quantifiersErrors() throws Exception {
 CelType messageType = StructTypeReference.create("cel.expr.conformance.proto3.TestAllTypes");
Expand Down

126 changes: 126 additions & 0 deletions
checker/src/test/resources/twoVarComprehensions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
Source: 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)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
_&&_(
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.map_string_string~map(string, string),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~string^i,
 v~string^v
 )~bool^less_string
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 x~cel.expr.conformance.proto3.TestAllTypes^x.repeated_int64~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _<_(
 i~int^i,
 v~int^v
 )~bool^less_int64
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and,
 _&&_(
 __comprehension__(
 // Variable
 i,
 v,
 // Target
 [
 1~int,
 2~int,
 3~int,
 4~int
 ]~list(int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 _<_(
 i~int^i,
 5~int
 )~bool^less_int64,
 _>_(
 v~int^v,
 0~int
 )~bool^greater_int64
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool,
 __comprehension__(
 // Variable
 k,
 v,
 // Target
 {
 "a"~string:1~int,
 "b"~string:2~int
 }~map(string, int),
 // Accumulator
 @result,
 // Init
 true~bool,
 // LoopCondition
 @not_strictly_false(
 @result~bool^@result
 )~bool^not_strictly_false,
 // LoopStep
 _&&_(
 @result~bool^@result,
 _&&_(
 k~string^k.startsWith(
 "a"~string
 )~bool^starts_with_string,
 _==_(
 v~int^v,
 1~int
 )~bool^equals
 )~bool^logical_and
 )~bool^logical_and,
 // Result
 @result~bool^@result)~bool
 )~bool^logical_and
)~bool^logical_and

11 changes: 11 additions & 0 deletions
checker/src/test/resources/twoVarComprehensionsErrors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
declare x {
 value cel.expr.conformance.proto3.TestAllTypes
}
=====>
ERROR: test_location:1:27: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ..........................^
ERROR: test_location:1:71: The argument must be a simple name
 | x.map_string_string.all(i + 1, v, i < v) && x.repeated_int64.all(i, v + 1, i < v)
 | ......................................................................^

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/ast/CelExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,7 +138,7 @@ public final CelExpr.CelStruct.Entry newMessageField(String field, CelExpr value
 .build();
 }

 /** Fold creates a fold comprehension instruction. */
 /** Fold creates a fold for one variable comprehension instruction. */
 public final CelExpr fold(
 String iterVar,
 CelExpr iterRange,
Expand Down

5 changes: 5 additions & 0 deletions
extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,3 +51,8 @@ java_library(
 name = "sets_function",
 exports = ["//extensions/src/main/java/dev/cel/extensions:sets_function"],
)

java_library(
 name = "comprehensions",
 exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

15 changes: 15 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ java_library(
 ],
 deps = [
 ":bindings",
 ":comprehensions",
 ":encoders",
 ":lists",
 ":math",
Expand DownExpand Up@@ -293,3 +294,17 @@ java_library(
 "@maven//:com_google_re2j_re2j",
 ],
)

java_library(
 name = "comprehensions",
 srcs = ["CelComprehensionsExtensions.java"],
 deps = [
 "//common:compiler_common",
 "//common/ast",
 "//compiler:compiler_builder",
 "//parser:macro",
 "//parser:operator",
 "//parser:parser_builder",
 "@maven//:com_google_guava_guava",
 ],
)

87 changes: 87 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.CelIssue;
import dev.cel.common.ast.CelExpr;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelMacroExprFactory;
import dev.cel.parser.CelParserBuilder;
import dev.cel.parser.Operator;
import java.util.Optional;

/** Internal implementation of CEL comprehensions extensions. */
public final class CelComprehensionsExtensions implements CelCompilerLibrary {
 // TODO: Implement CelExtensionLibrary.FeatureSet interface.
 public ImmutableSet<CelMacro> macros() {
 return ImmutableSet.of(
 CelMacro.newReceiverMacro(
 Operator.ALL.getFunction(), 3, CelComprehensionsExtensions::expandAllMacro));
 }

 @Override
 public void setParserOptions(CelParserBuilder parserBuilder) {
 parserBuilder.addMacros(macros());
 }

 private static Optional<CelExpr> expandAllMacro(
 CelMacroExprFactory exprFactory, CelExpr target, ImmutableList<CelExpr> arguments) {
 checkNotNull(exprFactory);
 checkNotNull(target);
 checkArgument(arguments.size() == 3);
 CelExpr arg0 = checkNotNull(arguments.get(0));
 if (arg0.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg0));
 }
 CelExpr arg1 = checkNotNull(arguments.get(1));
 if (arg1.exprKind().getKind() != CelExpr.ExprKind.Kind.IDENT) {
 return Optional.of(reportArgumentError(exprFactory, arg1));
 }
 CelExpr arg2 = checkNotNull(arguments.get(2));
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg2);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 arg1.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
 return exprFactory.reportError(
 CelIssue.formatError(
 exprFactory.getSourceLocation(argument), "The argument must be a simple name"));
 }
}

16 changes: 16 additions & 0 deletions
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ public final class CelExtensions {
 private static final CelProtoExtensions PROTO_EXTENSIONS = new CelProtoExtensions();
 private static final CelBindingsExtensions BINDINGS_EXTENSIONS = new CelBindingsExtensions();
 private static final CelRegexExtensions REGEX_EXTENSIONS = new CelRegexExtensions();
 private static final CelComprehensionsExtensions COMPREHENSIONS_EXTENSIONS =
 new CelComprehensionsExtensions();

 /**
 * Implementation of optional values.
Expand DownExpand Up@@ -305,6 +307,20 @@ public static CelRegexExtensions regex() {
 return REGEX_EXTENSIONS;
 }

 /**
 * Extended functions for Two Variable Comprehensions Expressions.
 *
 * <p>Refer to README.md for available functions.
 *
 * <p>This will include all functions denoted in {@link CelComprehensionsExtensions.Function},
 * including any future additions.
 */
 // TODO: Remove visibility restrictions and make this public once the feature is
 // ready.
 private static CelComprehensionsExtensions comprehensions() {
 return COMPREHENSIONS_EXTENSIONS;
 }

 /**
 * Retrieves all function names used by every extension libraries.
 *
Expand Down

1 change: 1 addition & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@ public final CelExpr copy(CelExpr expr) {
 builder.setComprehension(
 CelExpr.CelComprehension.newBuilder()
 .setIterVar(expr.comprehension().iterVar())
 .setIterVar2(expr.comprehension().iterVar2())
 .setIterRange(copy(expr.comprehension().iterRange()))
 .setAccuVar(expr.comprehension().accuVar())
 .setAccuInit(copy(expr.comprehension().accuInit()))
Expand Down

1 change: 1 addition & 0 deletions
testing/src/main/java/dev/cel/testing/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ java_library(
 "//common/types:type_providers",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:comprehensions",
 "//parser:macro",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down
Loading
Loading