Skip to content

Add enablePrattParser option and split Parser into AntlrParser and dispatcher #1212

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+6,110 −3,382
Open

Add enablePrattParser option and split Parser into AntlrParser and dispatcher #1212

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

public abstract boolean enableQuotedIdentifierSyntax();

public abstract boolean enablePrattParser();

// Type-Checker related options

public abstract boolean enableCompileTimeOverloadResolution();
Expand Down Expand Up @@ -144,6 +146,7 @@ public static Builder newBuilder() {
.retainUnbalancedLogicalExpressions(false)
.enableHiddenAccumulatorVar(true)
.enableQuotedIdentifierSyntax(true)
.enablePrattParser(false)
// Type-Checker options
.enableCompileTimeOverloadResolution(false)
.enableHomogeneousLiterals(false)
Expand Down Expand Up @@ -279,6 +282,14 @@ public abstract static class Builder {
*/
public abstract Builder enableQuotedIdentifierSyntax(boolean value);

/**
* Enables Pratt parser implementation over ANTLR parser.
*
* <p>The Pratt parser provides improved parsing performance (typically 4x–11x speedup over
* ANTLR) and lower memory overhead while producing an equivalent abstract syntax tree.
*/
public abstract Builder enablePrattParser(boolean value);

// Type-Checker related options

/**
Expand Down
1 change: 1 addition & 0 deletions common/src/test/java/dev/cel/common/CelOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ public void current_defaults() {
// Defaults that aren't represented in deprecated CelOptions
assertThat(CelOptions.current().build().enableUnknownTracking()).isFalse();
assertThat(CelOptions.current().build().resolveTypeDependencies()).isTrue();
assertThat(CelOptions.current().build().enablePrattParser()).isFalse();
}
}
4 changes: 2 additions & 2 deletions extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ public void abs_overflow_throwsException() {

assertThat(e)
.hasMessageThat()
.contains("ERROR: <input>:1:10: For input string: \"-9223372036854775809\"");
.contains("ERROR: <input>:1:10: invalid int literal: -9223372036854775809");
}

@Test
Expand Down Expand Up @@ -917,7 +917,7 @@ public void bitAnd_maxValArg_throwsException() {

assertThat(e)
.hasMessageThat()
.contains("ERROR: <input>:1:33: For input string: \"9223372036854775809\"");
.contains("ERROR: <input>:1:33: invalid int literal: 9223372036854775809");
}

@Test
Expand Down
Loading
Loading