Fix an issue with the error message not including the source location and position during function dispatch#569

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
Jan 30, 2025
Merged

Fix an issue with the error message not including the source location and position during function dispatch #569

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
"evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
+ " 6, Provided: 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

Expand Down
2 changes: 1 addition & 1 deletion codelab/src/test/codelab/Exercise1Test.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
IllegalArgumentException exception =
assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
}
}
9 changes: 6 additions & 3 deletions codelab/src/test/codelab/Exercise3Test.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
}

@Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
}

@Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
}
}
2 changes: 1 addition & 1 deletion codelab/src/test/codelab/Exercise8Test.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
.contains("evaluation error at <input>:15: key 'referer' is not present in map.");
assertThat(e2)
.hasMessageThat()
.contains("evaluation error at <input>:0: key 'referer' is not present in map.");
.contains("evaluation error: key 'referer' is not present in map.");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion codelab/src/test/codelab/solutions/Exercise1Test.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
IllegalArgumentException exception =
assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
}
}
9 changes: 6 additions & 3 deletions codelab/src/test/codelab/solutions/Exercise3Test.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
}

@Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
}

@Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
}
}
2 changes: 1 addition & 1 deletion codelab/src/test/codelab/solutions/Exercise8Test.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
.contains("evaluation error at <input>:15: key 'referer' is not present in map.");
assertThat(e2)
.hasMessageThat()
.contains("evaluation error at <input>:0: key 'referer' is not present in map.");
.contains("evaluation error: key 'referer' is not present in map.");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

assertThat(e)
.hasMessageThat()
.contains("evaluation error: Function 'list_flatten_list_int' failed");
.contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
}

Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

@CanIgnoreReturnValue
public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
this.errorLocation =
SafeStringFormatter.format(
" at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
if (metadata.hasPosition(exprId)) {
this.errorLocation =
SafeStringFormatter.format(
" at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
}

return this;
}

Expand Down
8 changes: 4 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
} catch (RuntimeException e) {
throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
.setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
.setMetadata(metadata, expr.id())
.build();
}
}
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
return IntermediateResult.create(attr, dispatchResult);
} catch (CelRuntimeException ce) {
throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
.setMetadata(metadata, expr.id())
.build();
} catch (RuntimeException e) {
throw CelEvaluationExceptionBuilder.newBuilder(
"Function '%s' failed with arg(s) '%s'",
overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
.setMetadata(metadata, expr.id())
.setCause(e)
.build();
}
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
.build());
} catch (CelRuntimeException e) {
throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
.setMetadata(metadata, expr.id())
.build();
}
}
Expand Down
7 changes: 6 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
@Override
public int getPosition(long exprId) {
ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
return positions.containsKey(exprId) ? positions.get(exprId) : 0;
return positions.getOrDefault(exprId, 0);
}

@Override
public boolean hasPosition(long exprId) {
return ast.getSource().getPositionsMap().containsKey(exprId);
}
}
3 changes: 3 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/Metadata.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
* Returns the character position of the node in the source. This is a 0-based character offset.
*/
int getPosition(long exprId);

/** Checks if a source position recorded for the provided expression id. */
boolean hasPosition(long exprId);
}
5 changes: 5 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
public int getPosition(long exprId) {
return 10;
}

@Override
public boolean hasPosition(long exprId) {
return true;
}
},
0);

Expand Down
16 changes: 8 additions & 8 deletions runtime/src/test/resources/arithmInt64_error.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO
12 changes: 6 additions & 6 deletions runtime/src/test/resources/arithmUInt64_error.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO
14 changes: 1 addition & 13 deletions runtime/src/test/resources/boolConversions.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false
11 changes: 11 additions & 0 deletions runtime/src/test/resources/boolConversions_error.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
51 changes: 1 addition & 50 deletions runtime/src/test/resources/booleans.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
value bool
}
declare y {
value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
value bool
}
declare y {
value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
value bool
}
declare y {
value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
value bool
}
declare y {
value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
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
Fix an issue with the error message not including the source location and position during function dispatch#569

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

Jan 30, 2025
 Merged


Fix an issue with the error message not including the source location and position during function dispatch
#569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2063,8 +2063,8 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
 assertThat(e)
 .hasMessageThat()
 .contains(
 "evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
 + " 7");
 "evaluation error at <input>:13: Regex pattern exceeds allowed program size. Allowed:"
 + " 6, Provided: 7");
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
 }

Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -77,7 +78,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -98,6 +100,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise1Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,6 @@ public void evaluate_divideByZeroExpression_throwsEvaluationException() throws E
 IllegalArgumentException exception =
 assertThrows(IllegalArgumentException.class, () -> exercise1.eval(ast));

 assertThat(exception).hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasMessageThat().contains("evaluation error at <input>:1: / by zero");
 }
}

9 changes: 6 additions & 3 deletions
codelab/src/test/codelab/solutions/Exercise3Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ public void evaluate_logicalOrFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -83,7 +84,8 @@ public void evaluate_logicalAndFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
Expand All@@ -108,6 +110,7 @@ public void evaluate_ternaryFailure_throwsException(String expression) {

 assertThat(exception).hasMessageThat().contains("Evaluation error has occurred.");
 assertThat(exception).hasCauseThat().isInstanceOf(CelEvaluationException.class);
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error: / by zero");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("evaluation error");
 assertThat(exception).hasCauseThat().hasMessageThat().contains("/ by zero");
 }
}

2 changes: 1 addition & 1 deletion
codelab/src/test/codelab/solutions/Exercise8Test.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,7 +128,7 @@ public void optimize_constantFold_evaluateError() throws Exception {
 .contains("evaluation error at <input>:15: key 'referer' is not present in map.");
 assertThat(e2)
 .hasMessageThat()
 .contains("evaluation error at <input>:0: key 'referer' is not present in map.");
 .contains("evaluation error: key 'referer' is not present in map.");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ public void flatten_negativeDepth_throws() {

 assertThat(e)
 .hasMessageThat()
 .contains("evaluation error: Function 'list_flatten_list_int' failed");
 .contains("evaluation error at <input>:17: Function 'list_flatten_list_int' failed");
 assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("Level must be non-negative");
 }

Expand Down

9 changes: 6 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,12 @@ public CelEvaluationExceptionBuilder setErrorCode(CelErrorCode errorCode) {

 @CanIgnoreReturnValue
 public CelEvaluationExceptionBuilder setMetadata(Metadata metadata, long exprId) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 if (metadata.hasPosition(exprId)) {
 this.errorLocation =
 SafeStringFormatter.format(
 " at %s:%d", metadata.getLocation(), metadata.getPosition(exprId));
 }

 return this;
 }

Expand Down

8 changes: 4 additions & 4 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ private IntermediateResult evalInternal(ExecutionFrame frame, CelExpr expr)
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e.getMessage())
 .setCause(e)
// .setMetadata(metadata, expr.id()) TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand DownExpand Up@@ -419,13 +419,13 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 return IntermediateResult.create(attr, dispatchResult);
 } catch (CelRuntimeException ce) {
 throw CelEvaluationExceptionBuilder.newBuilder(ce)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 } catch (RuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(
 "Function '%s' failed with arg(s) '%s'",
 overload.getOverloadId(), Joiner.on(", ").join(argArray))
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .setCause(e)
 .build();
 }
Expand DownExpand Up@@ -456,7 +456,7 @@ private ResolvedOverload findOverloadOrThrow(
 .build());
 } catch (CelRuntimeException e) {
 throw CelEvaluationExceptionBuilder.newBuilder(e)
// .setMetadata(metadata, expr.id()) // TODO: Uncomment in the upcoming cl
 .setMetadata(metadata, expr.id())
 .build();
 }
 }
Expand Down

7 changes: 6 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/DefaultMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ public String getLocation() {
 @Override
 public int getPosition(long exprId) {
 ImmutableMap<Long, Integer> positions = ast.getSource().getPositionsMap();
 return positions.containsKey(exprId) ? positions.get(exprId) : 0;
 return positions.getOrDefault(exprId, 0);
 }

 @Override
 public boolean hasPosition(long exprId) {
 return ast.getSource().getPositionsMap().containsKey(exprId);
 }
}

3 changes: 3 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/Metadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,4 +33,7 @@ public interface Metadata {
 * Returns the character position of the node in the source. This is a 0-based character offset.
 */
 int getPosition(long exprId);

 /** Checks if a source position recorded for the provided expression id. */
 boolean hasPosition(long exprId);
}

5 changes: 5 additions & 0 deletions
runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ public String getLocation() {
 public int getPosition(long exprId) {
 return 10;
 }

 @Override
 public boolean hasPosition(long exprId) {
 return true;
 }
 },
 0);

Expand Down

16 changes: 8 additions & 8 deletions
runtime/src/test/resources/arithmInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
Source: 9223372036854775807 + 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:20: long overflow
error_code: NUMERIC_OVERFLOW

Source: -9223372036854775808 - 1
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:21: long overflow
error_code: NUMERIC_OVERFLOW

Source: -(-9223372036854775808)
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:0: long overflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000 * 5000000000
=====>
bindings: {}
error: evaluation error: long overflow
error: evaluation error at test_location:11: long overflow
error_code: NUMERIC_OVERFLOW

Source: (-9223372036854775808)/-1
=====>
bindings: {}
error: evaluation error: most negative number wraps
error: evaluation error at test_location:22: most negative number wraps
error_code: NUMERIC_OVERFLOW

Source: 1 / 0
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 % 0
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:2: / by zero
error_code: DIVIDE_BY_ZERO

12 changes: 6 additions & 6 deletions
runtime/src/test/resources/arithmUInt64_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
Source: 18446744073709551615u + 1u
=====>
bindings: {}
error: evaluation error: range overflow on unsigned addition
error: evaluation error at test_location:22: range overflow on unsigned addition
error_code: NUMERIC_OVERFLOW

Source: 0u - 1u
=====>
bindings: {}
error: evaluation error: unsigned subtraction underflow
error: evaluation error at test_location:3: unsigned subtraction underflow
error_code: NUMERIC_OVERFLOW

Source: 5000000000u * 5000000000u
=====>
bindings: {}
error: evaluation error: multiply out of unsigned integer range
error: evaluation error at test_location:12: multiply out of unsigned integer range
error_code: NUMERIC_OVERFLOW

Source: 1u / 0u
=====>
bindings: {}
error: evaluation error: / by zero
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1u % 0u
=====>
bindings: {}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO
error: evaluation error at test_location:3: / by zero
error_code: DIVIDE_BY_ZERO

14 changes: 1 addition & 13 deletions
runtime/src/test/resources/boolConversions.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,16 +11,4 @@ result: true
Source: bool('false') || bool('FALSE') || bool('False') || bool('f') || bool('0')
=====>
bindings: {}
result: false

Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT
result: false

11 changes: 11 additions & 0 deletions
runtime/src/test/resources/boolConversions_error.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
Source: bool('TrUe')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [TrUe]
error_code: BAD_FORMAT

Source: bool('FaLsE')
=====>
bindings: {}
error: evaluation error at test_location:4: Type conversion error from 'string' to 'bool': [FaLsE]
error_code: BAD_FORMAT

51 changes: 1 addition & 50 deletions
runtime/src/test/resources/booleans.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,54 +41,6 @@ declare y {
bindings: {y=0}
result: true

Source: 1 / y == 1 || false
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: false || 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && true
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: true && 1 / y == 1
declare x {
 value bool
}
declare y {
 value int
}
=====>
bindings: {y=0}
error: evaluation error: / by zero
error_code: DIVIDE_BY_ZERO

Source: 1 / y == 1 && false
declare x {
 value bool
Expand DownExpand Up@@ -274,5 +226,4 @@ declare y {
}
=====>
bindings: {}
result: true

result: true
Loading