expr: improve the GNU compat #7167
Closed
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
|
GNU testsuite comparison: |
cakebaker
reviewed
Jan 21, 2025
Comment on lines
+77
to
+83
| #[derive(Debug, PartialEq)] | ||
| enum BraceContent { | ||
| Valid, | ||
| Invalid, | ||
| Unmatched(BraceType), | ||
| RegexTooBig, | ||
| } |
There was a problem hiding this comment.
Somehow I don't understand the purpose of this enum. With the exception of Valid, its variants are already defined as variants in ExprError.
cakebaker
reviewed
Jan 21, 2025
Comment on lines
+145
to
+156
| match check_posix_regex_errors(&re_string) { | ||
| BraceContent::Invalid => match is_valid_curly_content(&re_string) { | ||
| Err(ExprError::InvalidBraceContent) => { | ||
| return Err(ExprError::InvalidBraceContent) | ||
| } | ||
| Ok(()) => unreachable!(), | ||
| Err(err) => return Err(err), | ||
| }, | ||
| BraceContent::Unmatched(brace) => return Err(ExprError::UnmatchedBrace(brace)), | ||
| BraceContent::Valid => {} | ||
| BraceContent::RegexTooBig => return Err(ExprError::RegexTooBig), | ||
| } |
There was a problem hiding this comment.
It's related to my previous comment about BraceContent: I think the creation of the errors could be done in check_posix_regex_errors, thus not needing BraceContent.
sargas
reviewed
Jan 22, 2025
| @@ -716,21 +739,6 @@ mod test { | |||
| assert_eq!(result.eval_as_string(), ""); | |||
| } | |||
|
|
|||
| #[test] | |||
| fn starting_stars_become_escaped() { | |||
There was a problem hiding this comment.
Is this functionality removed with this PR?
| ("", None) => { | ||
| // Empty repeating pattern | ||
| invalid_content_error = true; | ||
| fn check_posix_regex_errors(s: &str) -> BraceContent { |
There was a problem hiding this comment.
Did you mean to remove the doc? I wanted to be explicit about the reason why this is needed (vs seeing what errors we get from Oniguruma)
| @@ -700,10 +727,6 @@ mod test { | |||
| AstNode::parse(&["(", "42"]), | |||
| Err(ExprError::ExpectedClosingBraceAfter("42".to_string())) | |||
| ); | |||
| assert_eq!( | |||
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.
@sargas wdyt ?