Skip to content

expr: Handle more special cases for regex pattern #7974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cakebaker merged 5 commits into from
May 25, 2025
Merged

expr: Handle more special cases for regex pattern #7974

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4555e6f
expr: Handle trailing backslash error
frendsick May 23, 2025
b0390fe
expr: Handle `$` at the beginning of the regex pattern
frendsick May 23, 2025
63ce37c
expr: Refactor regex tests into multiple targeted functions
frendsick May 24, 2025
2a862bc
expr: Simplify checking of the end of an expression
frendsick May 24, 2025
ab5cf74
expr: Simplify parsing special cases for `$` in regex
frendsick May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
expr: Simplify checking of the end of an expression 
Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
  • Loading branch information
@frendsick @cakebaker
frendsick and cakebaker authored May 24, 2025
commit 2a862bc385a6ac4ec15465776b100c84115d7654
8 changes: 1 addition & 7 deletions src/uu/expr/src/syntax_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,7 @@ where
{
let mut pattern_chars_clone = pattern_chars.clone();
match pattern_chars_clone.next() {
Some('\\') => {
match pattern_chars_clone.next() {
Some(')') // End of a capturing group
| Some('|') => true, // End of an alternative pattern
_ => false,
}
}
Some('\\') => matches!(pattern_chars_clone.next(), Some(')' | '|')),
None => true, // No characters left
_ => false,
}
Expand Down
Loading