Fix failure found by TestOperations.testGetRandomAcceptedString #14227
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
string: ?+½]+]+Ř*+[\]ᖴﴁ. expected: before apache#14193 java.lang.IllegalArgumentException: expected ']' at position 17 actual: after apache#14193 REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_REPEAT_MIN min=1 REGEXP_CHAR char=? REGEXP_CHAR char=½ REGEXP_REPEAT_MIN min=1 REGEXP_CHAR char=] REGEXP_CHAR char= REGEXP_REPEAT_MIN min=1 REGEXP_CHAR char=] REGEXP_REPEAT_MIN min=1 REGEXP_REPEAT REGEXP_CHAR char=Ř REGEXP_CHAR_CLASS starts=[] ends=[] REGEXP_STRING string=ᖴﴁ REGEXP_ANYCHAR Problem is caused by RegExp accepting too much rather than throwing exceptions like it should have. The lenience in the parser comes from "expandPreDefined" which invades on escape character parsing for character classes (e.g. \s). This one adds a lot of complexity to parsing. Don't invoke expandPreDefined(), except for the set of characters that it explicitly handles. This is also consistent with the way expandPreDefined()'s complexity is managed elsewhere in the parser, such as in parseSimpleExp(). Add parsing tests for testEmptyClass(), which is unchanged by this PR, but should be there, and testEscapedInvalidClass(), which fails without the change.
When we consume an escape, either it matches the predefined special logic, or we emit range for next(), no other logic: it is an escape. Add test for escaped '-' in a character class.
dweiss
approved these changes
Feb 13, 2025
asfgit
pushed a commit
that referenced
this pull request
Feb 13, 2025
* Fix failure found by TestOperations.testGetRandomAcceptedString string: ?+½]+]+Ř*+[\]ᖴﴁ. expected: before #14193 java.lang.IllegalArgumentException: expected ']' at position 17 actual: after #14193 REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_CONCATENATION REGEXP_REPEAT_MIN min=1 REGEXP_CHAR char=? REGEXP_CHAR char=½ REGEXP_REPEAT_MIN min=1 REGEXP_CHAR char=] REGEXP_CHAR char= REGEXP_REPEAT_MIN min=1 REGEXP_CHAR char=] REGEXP_REPEAT_MIN min=1 REGEXP_REPEAT REGEXP_CHAR char=Ř REGEXP_CHAR_CLASS starts=[] ends=[] REGEXP_STRING string=ᖴﴁ REGEXP_ANYCHAR Problem is caused by RegExp accepting too much rather than throwing exceptions like it should have. The lenience in the parser comes from "expandPreDefined" which invades on escape character parsing for character classes (e.g. \s). This one adds a lot of complexity to parsing. Don't invoke expandPreDefined(), except for the set of characters that it explicitly handles. This is also consistent with the way expandPreDefined()'s complexity is managed elsewhere in the parser, such as in parseSimpleExp(). Add parsing tests for testEmptyClass(), which is unchanged by this PR, but should be there, and testEscapedInvalidClass(), which fails without the change. When we consume an escape, either it matches the predefined special logic, or we emit range for next(), no other logic: it is an escape. Add test for escaped '-' in a character class.
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.
string:
?+½]+]+Ř*+[\]ᖴﴁ.expected: before #14193
actual: after #14193
Problem is caused by RegExp accepting too much rather than throwing exceptions like it should have. The lenience in the parser comes from
expandPreDefined()which invades on escape character parsing for character classes (e.g.\s). This one adds a lot of complexity to parsing.Don't invoke expandPreDefined(), except for the set of characters that it explicitly handles. This is also consistent with the way expandPreDefined()'s complexity is managed elsewhere in the parser, such as in
parseSimpleExp().Add parsing tests for
testEmptyClass(), which is unchanged by this PR, but should be there, andtestEscapedInvalidClass(), which fails without the change.Closes #14224