Change recursion checks to be rule based, better match the spec #443
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
jcking
reviewed
Aug 9, 2021
| if ctx == nil { | ||
| return | ||
| } | ||
| ruleIndex := ctx.GetRuleIndex() |
There was a problem hiding this comment.
Speed-wise, it might make more sense to use map[int]*int. That way you do not need to do do both a lookup and insert into a map each time.
jcking
reviewed
Aug 9, 2021
| if ctx == nil { | ||
| return | ||
| } | ||
| ruleIndex := ctx.GetRuleIndex() |
There was a problem hiding this comment.
I think this is safe. I remember having to put the increment after the recursion check. But looking at ANTLR Go, it appears that if EnterEveryRule panics, ExitEveryRule should not be called. Might want to double-check, otherwise things could go negative.
There was a problem hiding this comment.
Done. Added a defensive check since I'm using a pointer now as well.
TristonianJones
commented
Aug 9, 2021
| if ctx == nil { | ||
| return | ||
| } | ||
| ruleIndex := ctx.GetRuleIndex() |
There was a problem hiding this comment.
Done. Added a defensive check since I'm using a pointer now as well.
| if ctx == nil { | ||
| return | ||
| } | ||
| ruleIndex := ctx.GetRuleIndex() |
|
PTAL |
jcking
approved these changes
Aug 9, 2021
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.
The CEL spec indicates that the max recursion limit for any one grammar element
is effectively 32. At present, the current recursion limiting strategy employed by
the parser only checks for recursion at the top-level
exprnode, but recursion canalso occur within subrules like
calc,member, etc. The new strategy enforcesthe configured limit on a per-rule basis, rather than just for
exprto account forrecursion in subrules.