RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

expr: Simplify parsing a range quantifier

Browse source
This commit is contained in:
Teemu Pätsi 2025-05-27 14:53:05 +03:00
parent ce0c2320ea
commit 210f4f7154
No known key found for this signature in database
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/uu/expr/src/syntax_tree.rs
View file

@ -282,27 +282,25 @@ fn verify_range_quantifier<I>(pattern_chars: &I) -> Result<(), ExprError>
where where
I: Iterator<Item = char> + Clone, I: Iterator<Item = char> + Clone,
{ {
// Parse the string between braces
let mut quantifier = String::new();
let mut pattern_chars_clone = pattern_chars.clone().peekable(); let mut pattern_chars_clone = pattern_chars.clone().peekable();
let Some(mut prev) = pattern_chars_clone.next() else {
return Err(ExprError::UnmatchedOpeningBrace);
};
if pattern_chars_clone.peek().is_none() { if pattern_chars_clone.peek().is_none() {
return Err(ExprError::UnmatchedOpeningBrace); return Err(ExprError::UnmatchedOpeningBrace);
} }
let mut prev_is_escaped = false; // Parse the string between braces
let mut quantifier = String::new();
let mut prev = '\0';
let mut curr_is_escaped = false;
while let Some(curr) = pattern_chars_clone.next() { while let Some(curr) = pattern_chars_clone.next() {
if prev == '\\' && curr == '}' && !prev_is_escaped { curr_is_escaped = prev == '\\' && !curr_is_escaped;
if curr_is_escaped && curr == '}' {
break; break;
} }
if pattern_chars_clone.peek().is_none() { if pattern_chars_clone.peek().is_none() {
return Err(ExprError::UnmatchedOpeningBrace); return Err(ExprError::UnmatchedOpeningBrace);
} }
quantifier.push(prev); quantifier.push(curr);
prev_is_escaped = prev == '\\' && !prev_is_escaped;
prev = curr; prev = curr;
} }