Enhance CSE to handle two variable comprehensions#808

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
Sep 9, 2025
Merged

Enhance CSE to handle two variable comprehensions #808

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
4 changes: 3 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/CelExtensions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
stream(CelListsExtensions.Function.values())
.map(CelListsExtensions.Function::getFunction),
stream(CelRegexExtensions.Function.values())
.map(CelRegexExtensions.Function::getFunction))
.map(CelRegexExtensions.Function::getFunction),
stream(CelComprehensionsExtensions.Function.values())
.map(CelComprehensionsExtensions.Function::getFunction))
.collect(toImmutableSet());
}

Expand Down
3 changes: 2 additions & 1 deletion extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
"lists.@sortByAssociatedKeys",
"regex.replace",
"regex.extract",
"regex.extractAll");
"regex.extractAll",
"cel.@mapInsert");
}
}
103 changes: 88 additions & 15 deletions optimizer/src/main/java/dev/cel/optimizer/AstMutator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
private final long iterationLimit;

/**
* Returns a new instance of a AST mutator with the iteration limit set.
* Returns a new instance of an AST mutator with the iteration limit set.
*
* <p>Mutation is performed by walking the existing AST until the expression node to replace is
* found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
* @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
*/
public MangledComprehensionAst mangleComprehensionIdentifierNames(
CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
CelMutableAst ast,
String newIterVarPrefix,
String newIterVar2Prefix,
String newAccuVarPrefix) {
CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
comprehensionIdentifierPredicate =
comprehensionIdentifierPredicate
.and(node -> node.getKind().equals(Kind.COMPREHENSION))
.and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
.and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

.and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
.and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
.and(
node ->
!node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
navigableMutableAst
.getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
// Ensure the iter_var or the comprehension result is actually referenced in the
// loop_step. If it's not, we can skip mangling.
String iterVar = node.expr().comprehension().iterVar();
String iterVar2 = node.expr().comprehension().iterVar2();
String result = node.expr().comprehension().result().ident().name();
return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
.allNodes()
.filter(subNode -> subNode.getKind().equals(Kind.IDENT))
.map(subNode -> subNode.expr().ident())
.anyMatch(
ident -> ident.name().contains(iterVar) || ident.name().contains(result));
ident ->
ident.name().contains(iterVar)
|| ident.name().contains(iterVar2)
|| ident.name().contains(result));
})
.collect(
Collectors.toMap(
k -> k,
v -> {
CelMutableComprehension comprehension = v.expr().comprehension();
String iterVar = comprehension.iterVar();
String iterVar2 = comprehension.iterVar2();
// Identifiers to mangle could be the iteration variable, comprehension
// result or both, but at least one has to exist.
// As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
&& loopStepNode.expr().ident().name().equals(iterVar))
.map(CelNavigableMutableExpr::id)
.findAny();
Optional<Long> iterVar2Id =
CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
.allNodes()
.filter(
loopStepNode ->
!iterVar2.isEmpty()
&& loopStepNode.getKind().equals(Kind.IDENT)
&& loopStepNode.expr().ident().name().equals(iterVar2))
.map(CelNavigableMutableExpr::id)
.findAny();
Optional<CelType> iterVarType =
iterVarId.map(
id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
"Checked type not present for iteration"
+ " variable: "
+ iterVarId)));
Optional<CelType> iterVar2Type =
iterVar2Id.map(
id ->
navigableMutableAst
.getType(id)
.orElseThrow(
() ->
new NoSuchElementException(
"Checked type not present for iteration"
+ " variable: "
+ iterVar2Id)));
CelType resultType =
navigableMutableAst
.getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
"Result type was not present for the comprehension ID: "
+ comprehension.result().id()));

return MangledComprehensionType.of(iterVarType, resultType);
return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
},
(x, y) -> {
throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
MangledComprehensionName mangledComprehensionName =
getMangledComprehensionName(
newIterVarPrefix,
newIterVar2Prefix,
newAccuVarPrefix,
comprehensionNode,
comprehensionLevelToType,
comprehensionEntryType);
mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

String iterVar = comprehensionExpr.comprehension().iterVar();
String iterVar2 = comprehensionExpr.comprehension().iterVar2();
String accuVar = comprehensionExpr.comprehension().accuVar();
mutatedComprehensionExpr =
mangleIdentsInComprehensionExpr(
mutatedComprehensionExpr,
comprehensionExpr,
iterVar,
iterVar2,
accuVar,
mangledComprehensionName);
// Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
newSource,
mutatedComprehensionExpr,
iterVar,
iterVar2,
mangledComprehensionName,
comprehensionExpr.id());
iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

private static MangledComprehensionName getMangledComprehensionName(
String newIterVarPrefix,
String newIterVar2Prefix,
String newResultPrefix,
CelNavigableMutableExpr comprehensionNode,
Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
String mangledResultName =
newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
String mangledIterVar2Name =
newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

mangledComprehensionName =
MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
comprehensionLevelToType.put(
comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
}
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
CelMutableExpr root,
CelMutableExpr comprehensionExpr,
String originalIterVar,
String originalIterVar2,
String originalAccuVar,
MangledComprehensionName mangledComprehensionName) {
CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

comprehension.setIterVar(mangledComprehensionName.iterVarName());

// Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
if (comprehension.accuVar().equals(originalAccuVar)) {
comprehension.setAccuVar(mangledComprehensionName.resultName());
}

if (!originalIterVar2.isEmpty()) {
comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
replaceIdentName(
comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
}

return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
}

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
CelMutableSource sourceBuilder,
CelMutableExpr mutatedComprehensionExpr,
String originalIterVar,
String originalIterVar2,
MangledComprehensionName mangledComprehensionName,
long originalComprehensionId) {
if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
// macro call expression.
CelMutableExpr identToMangle = macroExpr.call().args().get(0);
if (identToMangle.ident().name().equals(originalIterVar)) {
// if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
macroExpr =
mutateExpr(
NO_OP_ID_GENERATOR,
macroExpr,
CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
identToMangle.id());
}
if (!originalIterVar2.isEmpty()) {
// Similarly by convention, iter_var2 is always the second argument of the macro call.
identToMangle = macroExpr.call().args().get(1);
if (identToMangle.ident().name().equals(originalIterVar2)) {
macroExpr =
mutateExpr(
NO_OP_ID_GENERATOR,
macroExpr,
CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
identToMangle.id());
}
}

newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
newMacroCall.addArgs(
existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

CelMutableList extraneousList = null;
CelMutableList extraneousList;
if (loopStepArgs.size() == 2) {
extraneousList = loopStepArgs.get(1).list();
} else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
@AutoValue
public abstract static class MangledComprehensionType {

/** Type of iter_var */
/**
* Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
* "[1].exists(i, true)"
*/
public abstract Optional<CelType> iterVarType();

/** Type of iter_var2. */
public abstract Optional<CelType> iterVar2Type();

/** Type of comprehension result */
public abstract CelType resultType();

private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
private static MangledComprehensionType of(
Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
return new AutoValue_AstMutator_MangledComprehensionType(
iterVarType, iterVarType2, resultType);
}
}

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
/** Mangled name for iter_var */
public abstract String iterVarName();

/** Mangled name for iter_var2 */
public abstract String iterVar2Name();

/** Mangled name for comprehension result */
public abstract String resultName();

private static MangledComprehensionName of(String iterVarName, String resultName) {
return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
private static MangledComprehensionName of(
String iterVarName, String iterVar2Name, String resultName) {
return new AutoValue_AstMutator_MangledComprehensionName(
iterVarName, iterVar2Name, resultName);
}
}
}
28 changes: 18 additions & 10 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
private static final String BIND_IDENTIFIER_PREFIX = "@r";
private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
private static final String CEL_BLOCK_FUNCTION = "cel.@block";
private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
astMutator.mangleComprehensionIdentifierNames(
astToModify,
MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
astToModify = mangledComprehensionAst.mutableAst();
CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
iterVarType ->
newVarDecls.add(
CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
type.iterVar2Type()
.ifPresent(
iterVar2Type ->
newVarDecls.add(
CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
});

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
navExpr
.allNodes()
.filter(
node ->
node.getKind().equals(Kind.IDENT)
&& (node.expr()
.ident()
.name()
.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| node.expr()
.ident()
.name()
.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
.collect(toImmutableList());

if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
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
Enhance CSE to handle two variable comprehensions#808

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

Sep 9, 2025
 Merged


Enhance CSE to handle two variable comprehensions
#808
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


4 changes: 3 additions & 1 deletion
extensions/src/main/java/dev/cel/extensions/CelExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,7 +338,9 @@ public static ImmutableSet<String> getAllFunctionNames() {
 stream(CelListsExtensions.Function.values())
 .map(CelListsExtensions.Function::getFunction),
 stream(CelRegexExtensions.Function.values())
 .map(CelRegexExtensions.Function::getFunction))
 .map(CelRegexExtensions.Function::getFunction),
 stream(CelComprehensionsExtensions.Function.values())
 .map(CelComprehensionsExtensions.Function::getFunction))
 .collect(toImmutableSet());
 }

Expand Down

3 changes: 2 additions & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ public void getAllFunctionNames() {
 "lists.@sortByAssociatedKeys",
 "regex.replace",
 "regex.extract",
 "regex.extractAll");
 "regex.extractAll",
 "cel.@mapInsert");
 }
}

103 changes: 88 additions & 15 deletions
optimizer/src/main/java/dev/cel/optimizer/AstMutator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public final class AstMutator {
 private final long iterationLimit;

 /**
 * Returns a new instance of a AST mutator with the iteration limit set.
 * Returns a new instance of an AST mutator with the iteration limit set.
 *
 * <p>Mutation is performed by walking the existing AST until the expression node to replace is
 * found, then the new subtree is walked to complete the mutation. Visiting of each node
Expand DownExpand Up@@ -205,15 +205,20 @@ public CelMutableAst renumberIdsConsecutively(CelMutableAst mutableAst) {
 * @param newAccuVarPrefix Prefix to use for new accumulation variable identifier name.
 */
 public MangledComprehensionAst mangleComprehensionIdentifierNames(
 CelMutableAst ast, String newIterVarPrefix, String newAccuVarPrefix) {
 CelMutableAst ast,
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newAccuVarPrefix) {
 CelNavigableMutableAst navigableMutableAst = CelNavigableMutableAst.fromAst(ast);
 Predicate<CelNavigableMutableExpr> comprehensionIdentifierPredicate = x -> true;
 comprehensionIdentifierPredicate =
 comprehensionIdentifierPredicate
 .and(node -> node.getKind().equals(Kind.COMPREHENSION))
 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix));

 .and(node -> !node.expr().comprehension().iterVar().startsWith(newIterVarPrefix + ":"))
 .and(node -> !node.expr().comprehension().accuVar().startsWith(newAccuVarPrefix + ":"))
 .and(
 node ->
 !node.expr().comprehension().iterVar2().startsWith(newIterVar2Prefix + ":"));
 LinkedHashMap<CelNavigableMutableExpr, MangledComprehensionType> comprehensionsToMangle =
 navigableMutableAst
 .getRoot()
Expand All@@ -226,20 +231,25 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 // Ensure the iter_var or the comprehension result is actually referenced in the
 // loop_step. If it's not, we can skip mangling.
 String iterVar = node.expr().comprehension().iterVar();
 String iterVar2 = node.expr().comprehension().iterVar2();
 String result = node.expr().comprehension().result().ident().name();
 return CelNavigableMutableExpr.fromExpr(node.expr().comprehension().loopStep())
 .allNodes()
 .filter(subNode -> subNode.getKind().equals(Kind.IDENT))
 .map(subNode -> subNode.expr().ident())
 .anyMatch(
 ident -> ident.name().contains(iterVar) || ident.name().contains(result));
 ident ->
 ident.name().contains(iterVar)
 || ident.name().contains(iterVar2)
 || ident.name().contains(result));
 })
 .collect(
 Collectors.toMap(
 k -> k,
 v -> {
 CelMutableComprehension comprehension = v.expr().comprehension();
 String iterVar = comprehension.iterVar();
 String iterVar2 = comprehension.iterVar2();
 // Identifiers to mangle could be the iteration variable, comprehension
 // result or both, but at least one has to exist.
 // As an example, [1,2].map(i, 3) would result in optional.empty for iteration
Expand All@@ -253,6 +263,16 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 && loopStepNode.expr().ident().name().equals(iterVar))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<Long> iterVar2Id =
 CelNavigableMutableExpr.fromExpr(comprehension.loopStep())
 .allNodes()
 .filter(
 loopStepNode ->
 !iterVar2.isEmpty()
 && loopStepNode.getKind().equals(Kind.IDENT)
 && loopStepNode.expr().ident().name().equals(iterVar2))
 .map(CelNavigableMutableExpr::id)
 .findAny();
 Optional<CelType> iterVarType =
 iterVarId.map(
 id ->
Expand All@@ -264,6 +284,17 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Checked type not present for iteration"
 + " variable: "
 + iterVarId)));
 Optional<CelType> iterVar2Type =
 iterVar2Id.map(
 id ->
 navigableMutableAst
 .getType(id)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Checked type not present for iteration"
 + " variable: "
 + iterVar2Id)));
 CelType resultType =
 navigableMutableAst
 .getType(comprehension.result().id())
Expand All@@ -273,7 +304,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 "Result type was not present for the comprehension ID: "
 + comprehension.result().id()));

 return MangledComprehensionType.of(iterVarType, resultType);
 return MangledComprehensionType.of(iterVarType, iterVar2Type, resultType);
 },
 (x, y) -> {
 throw new IllegalStateException(
Expand All@@ -299,19 +330,22 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 MangledComprehensionName mangledComprehensionName =
 getMangledComprehensionName(
 newIterVarPrefix,
 newIterVar2Prefix,
 newAccuVarPrefix,
 comprehensionNode,
 comprehensionLevelToType,
 comprehensionEntryType);
 mangledIdentNamesToType.put(mangledComprehensionName, comprehensionEntryType);

 String iterVar = comprehensionExpr.comprehension().iterVar();
 String iterVar2 = comprehensionExpr.comprehension().iterVar2();
 String accuVar = comprehensionExpr.comprehension().accuVar();
 mutatedComprehensionExpr =
 mangleIdentsInComprehensionExpr(
 mutatedComprehensionExpr,
 comprehensionExpr,
 iterVar,
 iterVar2,
 accuVar,
 mangledComprehensionName);
 // Repeat the mangling process for the macro source.
Expand All@@ -320,6 +354,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(
 newSource,
 mutatedComprehensionExpr,
 iterVar,
 iterVar2,
 mangledComprehensionName,
 comprehensionExpr.id());
 iterCount++;
Expand All@@ -339,6 +374,7 @@ public MangledComprehensionAst mangleComprehensionIdentifierNames(

 private static MangledComprehensionName getMangledComprehensionName(
 String newIterVarPrefix,
 String newIterVar2Prefix,
 String newResultPrefix,
 CelNavigableMutableExpr comprehensionNode,
 Table<Integer, MangledComprehensionType, MangledComprehensionName> comprehensionLevelToType,
Expand All@@ -356,7 +392,11 @@ private static MangledComprehensionName getMangledComprehensionName(
 newIterVarPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 String mangledResultName =
 newResultPrefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;
 mangledComprehensionName = MangledComprehensionName.of(mangledIterVarName, mangledResultName);
 String mangledIterVar2Name =
 newIterVar2Prefix + ":" + comprehensionNestingLevel + ":" + uniqueTypeIdx;

 mangledComprehensionName =
 MangledComprehensionName.of(mangledIterVarName, mangledIterVar2Name, mangledResultName);
 comprehensionLevelToType.put(
 comprehensionNestingLevel, comprehensionEntryType, mangledComprehensionName);
 }
Expand DownExpand Up@@ -509,6 +549,7 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 CelMutableExpr root,
 CelMutableExpr comprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 String originalAccuVar,
 MangledComprehensionName mangledComprehensionName) {
 CelMutableComprehension comprehension = comprehensionExpr.comprehension();
Expand All@@ -517,11 +558,18 @@ private CelMutableExpr mangleIdentsInComprehensionExpr(
 replaceIdentName(comprehensionExpr, originalAccuVar, mangledComprehensionName.resultName());

 comprehension.setIterVar(mangledComprehensionName.iterVarName());

 // Most standard macros set accu_var as __result__, but not all (ex: cel.bind).
 if (comprehension.accuVar().equals(originalAccuVar)) {
 comprehension.setAccuVar(mangledComprehensionName.resultName());
 }

 if (!originalIterVar2.isEmpty()) {
 comprehension.setIterVar2(mangledComprehensionName.iterVar2Name());
 replaceIdentName(
 comprehension.loopStep(), originalIterVar2, mangledComprehensionName.iterVar2Name());
 }

 return mutateExpr(NO_OP_ID_GENERATOR, root, comprehensionExpr, comprehensionExpr.id());
 }

Expand DownExpand Up@@ -560,6 +608,7 @@ private CelMutableSource mangleIdentsInMacroSource(
 CelMutableSource sourceBuilder,
 CelMutableExpr mutatedComprehensionExpr,
 String originalIterVar,
 String originalIterVar2,
 MangledComprehensionName mangledComprehensionName,
 long originalComprehensionId) {
 if (!sourceBuilder.getMacroCalls().containsKey(originalComprehensionId)) {
Expand All@@ -583,14 +632,25 @@ private CelMutableSource mangleIdentsInMacroSource(
 // macro call expression.
 CelMutableExpr identToMangle = macroExpr.call().args().get(0);
 if (identToMangle.ident().name().equals(originalIterVar)) {
 // if (identToMangle.identOrDefault().name().equals(originalIterVar)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVarName()),
 identToMangle.id());
 }
 if (!originalIterVar2.isEmpty()) {
 // Similarly by convention, iter_var2 is always the second argument of the macro call.
 identToMangle = macroExpr.call().args().get(1);
 if (identToMangle.ident().name().equals(originalIterVar2)) {
 macroExpr =
 mutateExpr(
 NO_OP_ID_GENERATOR,
 macroExpr,
 CelMutableExpr.ofIdent(mangledComprehensionName.iterVar2Name()),
 identToMangle.id());
 }
 }

 newSource.addMacroCalls(originalComprehensionId, macroExpr);

Expand DownExpand Up@@ -794,7 +854,7 @@ private static void unwrapListArgumentsInMacroCallExpr(
 newMacroCall.addArgs(
 existingMacroCall.args().get(0)); // iter_var is first argument of the call by convention

 CelMutableList extraneousList = null;
 CelMutableList extraneousList;
 if (loopStepArgs.size() == 2) {
 extraneousList = loopStepArgs.get(1).list();
 } else {
Expand DownExpand Up@@ -874,14 +934,22 @@ private static MangledComprehensionAst of(
 @AutoValue
 public abstract static class MangledComprehensionType {

 /** Type of iter_var */
 /**
 * Type of iter_var. Empty if iter_var is not referenced in the expression anywhere (ex: "i" in
 * "[1].exists(i, true)"
 */
 public abstract Optional<CelType> iterVarType();

 /** Type of iter_var2. */
 public abstract Optional<CelType> iterVar2Type();

 /** Type of comprehension result */
 public abstract CelType resultType();

 private static MangledComprehensionType of(Optional<CelType> iterVarType, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(iterVarType, resultType);
 private static MangledComprehensionType of(
 Optional<CelType> iterVarType, Optional<CelType> iterVarType2, CelType resultType) {
 return new AutoValue_AstMutator_MangledComprehensionType(
 iterVarType, iterVarType2, resultType);
 }
 }

Expand All@@ -895,11 +963,16 @@ public abstract static class MangledComprehensionName {
 /** Mangled name for iter_var */
 public abstract String iterVarName();

 /** Mangled name for iter_var2 */
 public abstract String iterVar2Name();

 /** Mangled name for comprehension result */
 public abstract String resultName();

 private static MangledComprehensionName of(String iterVarName, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(iterVarName, resultName);
 private static MangledComprehensionName of(
 String iterVarName, String iterVar2Name, String resultName) {
 return new AutoValue_AstMutator_MangledComprehensionName(
 iterVarName, iterVar2Name, resultName);
 }
 }
}

28 changes: 18 additions & 10 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
Expand DownExpand Up@@ -136,6 +137,7 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 astMutator.mangleComprehensionIdentifierNames(
 astToModify,
 MANGLED_COMPREHENSION_ITER_VAR_PREFIX,
 MANGLED_COMPREHENSION_ITER_VAR2_PREFIX,
 MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
 astToModify = mangledComprehensionAst.mutableAst();
 CelMutableSource sourceToModify = astToModify.source();
Expand DownExpand Up@@ -196,6 +198,12 @@ private OptimizationResult optimizeUsingCelBlock(CelAbstractSyntaxTree ast, Cel
 iterVarType ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVarName(), iterVarType)));
 type.iterVar2Type()
 .ifPresent(
 iterVar2Type ->
 newVarDecls.add(
 CelVarDecl.newVarDeclaration(name.iterVar2Name(), iterVar2Type)));

 newVarDecls.add(CelVarDecl.newVarDeclaration(name.resultName(), type.resultType()));
 });

Expand DownExpand Up@@ -445,16 +453,16 @@ private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navE
 navExpr
 .allNodes()
 .filter(
 node ->
node.getKind().equals(Kind.IDENT)
 && (node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || node.expr()
 .ident()
 .name()
 .startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX)))
 node -> {
if (!node.getKind().equals(Kind.IDENT)) {
return false;
}

String identName = node.expr().ident().name();
return identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX)
|| identName.startsWith(MANGLED_COMPREHENSION_ACCU_VAR_PREFIX);
})
 .collect(toImmutableList());

 if (comprehensionIdents.isEmpty()) {
Expand Down
Loading