ast/compile: fix print rewriting for arrays in unification #4099
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tsandall
previously approved these changes
Dec 7, 2021
| @@ -31,7 +31,14 @@ func TestUnify(t *testing.T) { | |||
| {"object/var-3", `{"x": 1, "y": x} = y`, "[]", "[]"}, | |||
| {"object/uneven", `{"x": x, "y": 1} = {"x": y}`, "[]", "[]"}, | |||
| {"object/uneven", `{"x": x, "y": 1} = {"x": y}`, "[x]", "[]"}, | |||
| {"call", "x = f(y)[z]", "[y]", "[x]"}, | |||
| {"var/call-ref", "x = f(y)[z]", "[y]", "[x]"}, | |||
There was a problem hiding this comment.
nit: I could imagine adding negative cases where one or more of the input arguments are not safe and therefore the output should not include any new variables. I'd include cases w/ vars as args as well as arrays/sets/objects containing vars.
outputVarsForExprEq, which is used in the rewriting of `print()` calls,
wasn't able to find `x` in
[_, x, _] = f(1)
and thus certain print expressions failed during the rewriting stage of
print() calls in the compiler.
Now, the "collection (array/object) = func call" is handled.
Furthermore, this adds calls to isRefSafe in a few places: as it turned
out, the test cases
{"array/ref", "[1,2,x] = a[_]", "[a]", "[x]"},
{"object/ref", `{"x": x} = a[_]`, "[a]", "[x]"},
would have, without the check, passed without "a" in "safe" (3rd field).
The fact that these cases are including "a" is evidence for this being
the correct behaviour.
Fixes open-policy-agent#4078.
Signed-off-by: Stephan Renatus <stephan.renatus@gmail.com>
srenatus
force-pushed
the
sr/ast/fix-rewriting-print-calls-via-output-vars-of-eq-expr
branch
from
3a99fcb
to
6f830dc
Compare
srenatus
commented
Dec 8, 2021
| case Call: | ||
| if isCallSafe(b, u.safe) { | ||
| u.markSafe(a) | ||
| } |
There was a problem hiding this comment.
💡 Found this when adding extra negative test cases.
srenatus
deleted the
sr/ast/fix-rewriting-print-calls-via-output-vars-of-eq-expr
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
outputVarsForExprEq, which is used in the rewriting of
print()calls,wasn't able to find
xinand thus certain print expressions failed during the rewriting stage of
print() calls in the compiler.
Now, the "collection (array/object) = func call" is handled.
Furthermore, this adds calls to isRefSafe in a few places: as it turned
out, the test cases
would have, without the check, passed without "a" in "safe" (3rd field).
The fact that these cases are including "a" is evidence for this being
the correct behaviour.
Fixes #4078.