Skip to content
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

Jump to bottom

topdown: Fix confusing error message for minus operator #4090

Merged
merged 1 commit into from Dec 3, 2021
Merged

topdown: Fix confusing error message for minus operator #4090

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions test/cases/testdata/arithmetic/test-arithmetic-minus-type-error.yaml
View file
Open in desktop
@@ -0,0 +1,27 @@
cases:
- data:
modules:
- |
package test

p {
{1} - 1
}
note: arithmetic/minus/type error
query: data.test.p = x
want_error: operand 2 must be set but got number
want_error_code: eval_type_error
strict_error: true
- data:
modules:
- |
package test

p {
1 - {1}
}
note: arithmetic/minus/type error
query: data.test.p = x
want_error: operand 2 must be number but got set
want_error_code: eval_type_error
strict_error: true
6 changes: 5 additions & 1 deletion topdown/arithmetic.go
View file
Open in desktop
Expand Up @@ -137,7 +137,11 @@ func builtinMinus(a, b ast.Value) (ast.Value, error) {
return nil, builtins.NewOperandTypeErr(1, a, "number", "set")
}

return nil, builtins.NewOperandTypeErr(2, b, "number", "set")
if ok2 {
return nil, builtins.NewOperandTypeErr(2, b, "set")
}

return nil, builtins.NewOperandTypeErr(2, b, "number")
}

func builtinRem(a, b ast.Value) (ast.Value, error) {
Expand Down