Add option to enable updated accumulator variable.#538

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
Dec 19, 2024
Merged

Add option to enable updated accumulator variable. #538

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
13 changes: 13 additions & 0 deletions common/src/main/java/dev/cel/common/CelOptions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean retainUnbalancedLogicalExpressions();

public abstract boolean enableHiddenAccumulatorVar();

// Type-Checker related options

public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
.populateMacroCalls(false)
.retainRepeatedUnaryOperators(false)
.retainUnbalancedLogicalExpressions(false)
.enableHiddenAccumulatorVar(false)
// Type-Checker options
.enableCompileTimeOverloadResolution(false)
.enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
*/
public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

/**
* Enable the use of a hidden accumulator variable name.
*
* <p>This is a temporary option to transition to using an internal identifier for the
* accumulator variable used by builtin comprehension macros. When enabled, parses result in a
* semantically equivalent AST, but with a different accumulator variable that can't be directly
* referenced in the source expression.
*/
public abstract Builder enableHiddenAccumulatorVar(boolean value);

// Type-Checker related options

/**
Expand Down
3 changes: 3 additions & 0 deletions parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
/** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
public abstract CelExpr reportError(CelIssue error);

/** Returns the default accumulator variable name used by macros implementing comprehensions. */
public abstract String getAccumulatorVarName();

/** Retrieves the source location for the given {@link CelExpr} ID. */
public final CelSourceLocation getSourceLocation(CelExpr expr) {
return getSourceLocation(expr.id());
Expand Down
66 changes: 44 additions & 22 deletions parser/src/main/java/dev/cel/parser/CelStandardMacro.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

private static final String ACCUMULATOR_VAR = "__result__";

private final CelMacro macro;

CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
CelExpr accuInit = exprFactory.newBoolLiteral(true);
CelExpr condition =
exprFactory.newGlobalCall(
Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
Operator.NOT_STRICTLY_FALSE.getFunction(),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
CelExpr step =
exprFactory.newGlobalCall(
Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
Operator.LOGICAL_AND.getFunction(),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
arg1);
CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
return Optional.of(
exprFactory.fold(
arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
arg0.ident().name(),
target,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
result));
}

// CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
exprFactory.newGlobalCall(
Operator.NOT_STRICTLY_FALSE.getFunction(),
exprFactory.newGlobalCall(
Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
Operator.LOGICAL_NOT.getFunction(),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
CelExpr step =
exprFactory.newGlobalCall(
Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
Operator.LOGICAL_OR.getFunction(),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
arg1);
CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
return Optional.of(
exprFactory.fold(
arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
arg0.ident().name(),
target,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
result));
}

// CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
arg1,
exprFactory.newGlobalCall(
Operator.ADD.getFunction(),
exprFactory.newIdentifier(ACCUMULATOR_VAR),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
exprFactory.newIntLiteral(1)),
exprFactory.newIdentifier(ACCUMULATOR_VAR));
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
CelExpr result =
exprFactory.newGlobalCall(
Operator.EQUALS.getFunction(),
exprFactory.newIdentifier(ACCUMULATOR_VAR),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
exprFactory.newIntLiteral(1));
return Optional.of(
exprFactory.fold(
arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
arg0.ident().name(),
target,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
result));
}

// CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
CelExpr step =
exprFactory.newGlobalCall(
Operator.ADD.getFunction(),
exprFactory.newIdentifier(ACCUMULATOR_VAR),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
exprFactory.newList(arg1));
if (arg2 != null) {
step =
exprFactory.newGlobalCall(
Operator.CONDITIONAL.getFunction(),
arg2,
step,
exprFactory.newIdentifier(ACCUMULATOR_VAR));
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
}
return Optional.of(
exprFactory.fold(
arg0.ident().name(),
target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
exprFactory.newIdentifier(ACCUMULATOR_VAR)));
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
}

// CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
CelExpr step =
exprFactory.newGlobalCall(
Operator.ADD.getFunction(),
exprFactory.newIdentifier(ACCUMULATOR_VAR),
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
exprFactory.newList(arg0));
step =
exprFactory.newGlobalCall(
Operator.CONDITIONAL.getFunction(),
arg1,
step,
exprFactory.newIdentifier(ACCUMULATOR_VAR));
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
return Optional.of(
exprFactory.fold(
arg0.ident().name(),
target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
accuInit,
condition,
step,
exprFactory.newIdentifier(ACCUMULATOR_VAR)));
exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
}

private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down
20 changes: 18 additions & 2 deletions parser/src/main/java/dev/cel/parser/Parser.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
"var",
"void",
"while");
private static final String ACCUMULATOR_NAME = "__result__";
private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
CelSource.Builder sourceInfo = source.toBuilder();
sourceInfo.setDescription(source.getDescription());
ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
ExprFactory exprFactory =
new ExprFactory(
antlrParser,
sourceInfo,
options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
ErrorListener errorListener = new ErrorListener(exprFactory);
antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
private final CelSource.Builder sourceInfo;
private final ArrayList<CelIssue> issues;
private final ArrayDeque<Integer> positions;
private final String accumulatorVarName;

private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
private ExprFactory(
org.antlr.v4.runtime.Parser recognizer,
CelSource.Builder sourceInfo,
String accumulatorVarName) {
this.recognizer = recognizer;
this.sourceInfo = sourceInfo;
this.issues = new ArrayList<>();
this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
this.accumulatorVarName = accumulatorVarName;
}

// Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
return ERROR;
}

@Override
public String getAccumulatorVarName() {
return accumulatorVarName;
}

// Internal methods used by the parser but not part of the public API.
@FormatMethod
@CanIgnoreReturnValue
Expand Down
5 changes: 5 additions & 0 deletions parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
}

@Override
public String getAccumulatorVarName() {
return "__result__";
}

@Override
protected CelSourceLocation getSourceLocation(long exprId) {
return CelSourceLocation.NONE;
Expand Down
21 changes: 21 additions & 0 deletions parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
PARSER
.toParserBuilder()
.setOptions(
CelOptions.current()
.populateMacroCalls(true)
.enableHiddenAccumulatorVar(true)
.build())
.build();

@Test
public void parser() {
runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
"while");
}

@Test
public void parser_updatedAccuVar() {
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
}

@Test
public void parser_errors() {
runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
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
Add option to enable updated accumulator variable.#538

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

Dec 19, 2024
 Merged


Add option to enable updated accumulator variable.
#538
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


13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract boolean retainUnbalancedLogicalExpressions();

 public abstract boolean enableHiddenAccumulatorVar();

 // Type-Checker related options

 public abstract boolean enableCompileTimeOverloadResolution();
Expand DownExpand Up@@ -188,6 +190,7 @@ public static Builder newBuilder() {
 .populateMacroCalls(false)
 .retainRepeatedUnaryOperators(false)
 .retainUnbalancedLogicalExpressions(false)
 .enableHiddenAccumulatorVar(false)
 // Type-Checker options
 .enableCompileTimeOverloadResolution(false)
 .enableHomogeneousLiterals(false)
Expand DownExpand Up@@ -319,6 +322,16 @@ public abstract static class Builder {
 */
 public abstract Builder retainUnbalancedLogicalExpressions(boolean value);

 /**
 * Enable the use of a hidden accumulator variable name.
 *
 * <p>This is a temporary option to transition to using an internal identifier for the
 * accumulator variable used by builtin comprehension macros. When enabled, parses result in a
 * semantically equivalent AST, but with a different accumulator variable that can't be directly
 * referenced in the source expression.
 */
 public abstract Builder enableHiddenAccumulatorVar(boolean value);

 // Type-Checker related options

 /**
Expand Down

3 changes: 3 additions & 0 deletions
parser/src/main/java/dev/cel/parser/CelMacroExprFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ public final CelExpr reportError(String message) {
 /** Reports a {@link CelIssue} and returns a sentinel {@link CelExpr} that indicates an error. */
 public abstract CelExpr reportError(CelIssue error);

 /** Returns the default accumulator variable name used by macros implementing comprehensions. */
 public abstract String getAccumulatorVarName();

 /** Retrieves the source location for the given {@link CelExpr} ID. */
 public final CelSourceLocation getSourceLocation(CelExpr expr) {
 return getSourceLocation(expr.id());
Expand Down

66 changes: 44 additions & 22 deletions
parser/src/main/java/dev/cel/parser/CelStandardMacro.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,6 @@ public enum CelStandardMacro {
 public static final ImmutableSet<CelStandardMacro> STANDARD_MACROS =
 ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER);

 private static final String ACCUMULATOR_VAR = "__result__";

 private final CelMacro macro;

 CelStandardMacro(CelMacro macro) {
Expand DownExpand Up@@ -123,14 +121,23 @@ private static Optional<CelExpr> expandAllMacro(
 CelExpr accuInit = exprFactory.newBoolLiteral(true);
 CelExpr condition =
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR));
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_AND.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_AND.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists() macro.
Expand All@@ -149,14 +156,23 @@ private static Optional<CelExpr> expandExistsMacro(
 exprFactory.newGlobalCall(
 Operator.NOT_STRICTLY_FALSE.getFunction(),
 exprFactory.newGlobalCall(
 Operator.LOGICAL_NOT.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 Operator.LOGICAL_NOT.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.LOGICAL_OR.getFunction(), exprFactory.newIdentifier(ACCUMULATOR_VAR), arg1);
 CelExpr result = exprFactory.newIdentifier(ACCUMULATOR_VAR);
 Operator.LOGICAL_OR.getFunction(),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 arg1);
 CelExpr result = exprFactory.newIdentifier(exprFactory.getAccumulatorVarName());
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's exists_one() macro.
Expand All@@ -178,17 +194,23 @@ private static Optional<CelExpr> expandExistsOneMacro(
 arg1,
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1)),
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 CelExpr result =
 exprFactory.newGlobalCall(
 Operator.EQUALS.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newIntLiteral(1));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(), target, ACCUMULATOR_VAR, accuInit, condition, step, result));
 arg0.ident().name(),
 target,
 exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 result));
 }

 // CelMacroExpander implementation for CEL's map() macro.
Expand DownExpand Up@@ -218,25 +240,25 @@ private static Optional<CelExpr> expandMapMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg1));
 if (arg2 != null) {
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg2,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 }
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 // CelMacroExpander implementation for CEL's filter() macro.
Expand All@@ -255,23 +277,23 @@ private static Optional<CelExpr> expandFilterMacro(
 CelExpr step =
 exprFactory.newGlobalCall(
 Operator.ADD.getFunction(),
 exprFactory.newIdentifier(ACCUMULATOR_VAR),
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()),
 exprFactory.newList(arg0));
 step =
 exprFactory.newGlobalCall(
 Operator.CONDITIONAL.getFunction(),
 arg1,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName()));
 return Optional.of(
 exprFactory.fold(
 arg0.ident().name(),
 target,
ACCUMULATOR_VAR,
exprFactory.getAccumulatorVarName(),
 accuInit,
 condition,
 step,
 exprFactory.newIdentifier(ACCUMULATOR_VAR)));
 exprFactory.newIdentifier(exprFactory.getAccumulatorVarName())));
 }

 private static CelExpr reportArgumentError(CelMacroExprFactory exprFactory, CelExpr argument) {
Expand Down

20 changes: 18 additions & 2 deletions
parser/src/main/java/dev/cel/parser/Parser.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,8 @@ final class Parser extends CELBaseVisitor<CelExpr> {
 "var",
 "void",
 "while");
 private static final String ACCUMULATOR_NAME = "__result__";
 private static final String HIDDEN_ACCUMULATOR_NAME = "@result";

 static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOptions options) {
 if (source.getContent().size() > options.maxExpressionCodePointSize()) {
Expand All@@ -142,7 +144,11 @@ static CelValidationResult parse(CelParserImpl parser, CelSource source, CelOpti
 CELParser antlrParser = new CELParser(new CommonTokenStream(antlrLexer));
 CelSource.Builder sourceInfo = source.toBuilder();
 sourceInfo.setDescription(source.getDescription());
 ExprFactory exprFactory = new ExprFactory(antlrParser, sourceInfo);
 ExprFactory exprFactory =
 new ExprFactory(
 antlrParser,
 sourceInfo,
 options.enableHiddenAccumulatorVar() ? HIDDEN_ACCUMULATOR_NAME : ACCUMULATOR_NAME);
 Parser parserImpl = new Parser(parser, options, sourceInfo, exprFactory);
 ErrorListener errorListener = new ErrorListener(exprFactory);
 antlrLexer.removeErrorListeners();
Expand DownExpand Up@@ -1033,12 +1039,17 @@ private static final class ExprFactory extends CelMacroExprFactory {
 private final CelSource.Builder sourceInfo;
 private final ArrayList<CelIssue> issues;
 private final ArrayDeque<Integer> positions;
 private final String accumulatorVarName;

 private ExprFactory(org.antlr.v4.runtime.Parser recognizer, CelSource.Builder sourceInfo) {
 private ExprFactory(
 org.antlr.v4.runtime.Parser recognizer,
 CelSource.Builder sourceInfo,
 String accumulatorVarName) {
 this.recognizer = recognizer;
 this.sourceInfo = sourceInfo;
 this.issues = new ArrayList<>();
 this.positions = new ArrayDeque<>(1); // Currently this usually contains at most 1 position.
 this.accumulatorVarName = accumulatorVarName;
 }

 // Implementation of CelExprFactory.
Expand All@@ -1062,6 +1073,11 @@ public CelExpr reportError(CelIssue error) {
 return ERROR;
 }

 @Override
 public String getAccumulatorVarName() {
 return accumulatorVarName;
 }

 // Internal methods used by the parser but not part of the public API.
 @FormatMethod
 @CanIgnoreReturnValue
Expand Down

5 changes: 5 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelMacroExprFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ public CelExpr reportError(CelIssue issue) {
 return CelExpr.newBuilder().setId(nextExprId()).setConstant(Constants.ERROR).build();
 }

 @Override
 public String getAccumulatorVarName() {
 return "__result__";
 }

 @Override
 protected CelSourceLocation getSourceLocation(long exprId) {
 return CelSourceLocation.NONE;
Expand Down

21 changes: 21 additions & 0 deletions
parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,16 @@ public final class CelParserParameterizedTest extends BaselineTestCase {
 .setOptions(CelOptions.current().populateMacroCalls(true).build())
 .build();

 private static final CelParser PARSER_WITH_UPDATED_ACCU_VAR =
 PARSER
 .toParserBuilder()
 .setOptions(
 CelOptions.current()
 .populateMacroCalls(true)
 .enableHiddenAccumulatorVar(true)
 .build())
 .build();

 @Test
 public void parser() {
 runTest(PARSER, "x * 2");
Expand DownExpand Up@@ -193,6 +203,17 @@ public void parser() {
 "while");
 }

 @Test
 public void parser_updatedAccuVar() {
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "x * 2");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "has(m.f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.exists_one(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.all(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.map(v, p, f)");
 runTest(PARSER_WITH_UPDATED_ACCU_VAR, "m.filter(v, p)");
 }

 @Test
 public void parser_errors() {
 runTest(PARSER, "*@a | b");
Expand Down
Loading