Regex parser improvements and bug fixes #4087
Merged
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
Signed-off-by: Andy Grove <[email protected]>
andygrove
commented
Nov 11, 2021
| RegexRepetition(RegexCharacterClass(negated = false, | ||
| ListBuffer(RegexCharacterRange('0', '9'))),SimpleQuantifier('+'))))), | ||
| RegexChar('|'), |
There was a problem hiding this comment.
Previously we were detecting | as a character and not as a choice delimiter
jlowe
approved these changes
Nov 11, 2021
| private def parseInternal(): RegexAST = { | ||
| val term = parseTerm(() => peek().contains('|')) | ||
| private def parseUntil(until: () => Boolean): RegexAST = { | ||
| val term = parseTerm(() => until() || peek().contains('|')) | ||
| if (!eof() && peek().contains('|')) { |
There was a problem hiding this comment.
Nit: Not needed as part of this PR, but I think peek() will return None at EOF, so this can be simplified to:
Suggested change
| if (!eof() && peek().contains('|')) { | |
| if (peek().contains('|')) { |
Applies to a few other places where eof and peek are combined.
Comment on lines
+94
to
+95
| while (!eof() && !until() | ||
| && (peek().exists(ch => ch == '*' || ch == '+' || ch == '?') |
There was a problem hiding this comment.
Per previous nit, should be able to simplify this to something like:
Suggested change
| while (!eof() && !until() | |
| && (peek().exists(ch => ch == '*' || ch == '+' || ch == '?') | |
| while (!until() && (peek().exists(ch => ch == '*' || ch == '+' || ch == '?') |
|
build |
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.
Signed-off-by: Andy Grove [email protected]
This PR fixes some issues I found during more extensive testing with random inputs.
]as the first character