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: Remove redundant checks for UnmatchedOpeningBrace

Browse source 
It is handled in `verify_range_quantifier` function.
This commit is contained in:
Teemu Pätsi 2025-05-27 14:35:13 +03:00
parent 07caa4867b
commit ce0c2320ea
No known key found for this signature in database
1 changed files with 6 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@
use std::{cell::Cell, collections::BTreeMap}; use std::{cell::Cell, collections::BTreeMap};
use num_bigint::{BigInt, ParseBigIntError}; use num_bigint::{BigInt, ParseBigIntError};
use num_traits::{ToPrimitive, Zero}; use num_traits::ToPrimitive;
use onig::{Regex, RegexOptions, Syntax}; use onig::{Regex, RegexOptions, Syntax};
use crate::{ExprError, ExprResult}; use crate::{ExprError, ExprResult};
@ -351,15 +351,11 @@ where
/// has specific error messages. /// has specific error messages.
fn check_posix_regex_errors(pattern: &str) -> ExprResult<()> { fn check_posix_regex_errors(pattern: &str) -> ExprResult<()> {
let mut escaped_parens: u64 = 0; let mut escaped_parens: u64 = 0;
let mut escaped_braces: u64 = 0;
let mut prev = '\0'; let mut prev = '\0';
let mut prev_is_escaped = false; let mut curr_is_escaped = false;
let mut is_brace_ignored = false;
let mut is_start_of_expression = true;
for curr in pattern.chars() { for curr in pattern.chars() {
let curr_is_escaped = prev == '\\' && !prev_is_escaped; curr_is_escaped = prev == '\\' && !curr_is_escaped;
match (curr_is_escaped, curr) { match (curr_is_escaped, curr) {
(true, '(') => escaped_parens += 1, (true, '(') => escaped_parens += 1,
(true, ')') => { (true, ')') => {
@ -367,31 +363,14 @@ fn check_posix_regex_errors(pattern: &str) -> ExprResult<()> {
.checked_sub(1) .checked_sub(1)
.ok_or(ExprError::UnmatchedClosingParenthesis)?; .ok_or(ExprError::UnmatchedClosingParenthesis)?;
} }
(true, '{') => {
is_brace_ignored = is_start_of_expression;
if !is_brace_ignored {
escaped_braces += 1;
}
}
(true, '}') => {
if !is_brace_ignored {
escaped_braces = escaped_braces.saturating_sub(1);
}
}
_ => {} _ => {}
} }
is_start_of_expression = prev == '\0'
|| curr_is_escaped && matches!(curr, '(' | '|')
|| curr == '\\' && prev_is_escaped && matches!(prev, '(' | '|');
prev_is_escaped = curr_is_escaped;
prev = curr; prev = curr;
} }
match (escaped_parens.is_zero(), escaped_braces.is_zero()) { match escaped_parens {
(true, true) => Ok(()), 0 => Ok(()),
(_, false) => Err(ExprError::UnmatchedOpeningBrace), _ => Err(ExprError::UnmatchedOpeningParenthesis),
(false, _) => Err(ExprError::UnmatchedOpeningParenthesis),
} }
} }
@ -1000,11 +979,6 @@ mod test {
check_posix_regex_errors(r"\(abc"), check_posix_regex_errors(r"\(abc"),
Err(ExprError::UnmatchedOpeningParenthesis) Err(ExprError::UnmatchedOpeningParenthesis)
); );
assert_eq!(
check_posix_regex_errors(r"a\{1,2"),
Err(ExprError::UnmatchedOpeningBrace)
);
} }
#[test] #[test]