RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

expr: Handle special cases for $ in regex

Browse source 
Enable fixed test `test_bre11`
This commit is contained in:
Teemu Pätsi 2025-05-23 15:24:17 +03:00
parent f664578a4b
commit 29332865a9
No known key found for this signature in database
2 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ impl StringOp {
re_string.push('^'); re_string.push('^');
// Handle first character from the input pattern // Handle first character from the input pattern
let mut pattern_chars = right.chars(); let mut pattern_chars = right.chars().peekable();
let first = pattern_chars.next(); let first = pattern_chars.next();
match first { match first {
Some('^') => {} // Start of string anchor is already added Some('^') => {} // Start of string anchor is already added
@ -166,10 +166,9 @@ impl StringOp {
}; };
// Handle the rest of the input pattern. // Handle the rest of the input pattern.
// Escaped previous character should not affect the current.
let mut prev = first.unwrap_or_default(); let mut prev = first.unwrap_or_default();
let mut prev_is_escaped = false; let mut prev_is_escaped = false;
for curr in pattern_chars { while let Some(curr) = pattern_chars.next() {
match curr { match curr {
'^' => match (prev, prev_is_escaped) { '^' => match (prev, prev_is_escaped) {
// Start of a capturing group // Start of a capturing group
@ -181,6 +180,26 @@ impl StringOp {
// Explicitly escaped caret // Explicitly escaped caret
| ('\\', false) => re_string.push(curr), | ('\\', false) => re_string.push(curr),
_ => re_string.push_str(r"\^"), _ => re_string.push_str(r"\^"),
},
'$' => {
if let Some('\\') = pattern_chars.peek() {
// The next character was checked to be a backslash
let backslash = pattern_chars.next().unwrap_or_default();
match pattern_chars.peek() {
// End of a capturing group
Some(')') => re_string.push('$'),
// End of an alternative pattern
Some('|') => re_string.push('$'),
_ => re_string.push_str(r"\$"),
}
re_string.push(backslash);
} else if (prev_is_escaped || prev != '\\')
&& pattern_chars.peek().is_some()
{
re_string.push_str(r"\$");
} else {
re_string.push('$');
}
} }
_ => re_string.push(curr), _ => re_string.push(curr),
} }

13
tests/by-util/test_expr.rs
View file

@ -294,6 +294,14 @@ fn test_regex() {
.args(&["a$b", ":", "a\\$b"]) .args(&["a$b", ":", "a\\$b"])
.succeeds() .succeeds()
.stdout_only("3\n"); .stdout_only("3\n");
new_ucmd!()
.args(&["a", ":", "a$\\|b"])
.succeeds()
.stdout_only("1\n");
new_ucmd!()
.args(&["ab", ":", "a\\(b$\\)"])
.succeeds()
.stdout_only("b\n");
new_ucmd!() new_ucmd!()
.args(&["abc", ":", "^abc"]) .args(&["abc", ":", "^abc"])
.succeeds() .succeeds()
@ -306,6 +314,10 @@ fn test_regex() {
.args(&["b^$ic", ":", "b^\\$ic"]) .args(&["b^$ic", ":", "b^\\$ic"])
.succeeds() .succeeds()
.stdout_only("5\n"); .stdout_only("5\n");
new_ucmd!()
.args(&["a$c", ":", "a$\\c"])
.succeeds()
.stdout_only("3\n");
new_ucmd!() new_ucmd!()
.args(&["^^^^^^^^^", ":", "^^^"]) .args(&["^^^^^^^^^", ":", "^^^"])
.succeeds() .succeeds()
@ -774,7 +786,6 @@ mod gnu_expr {
.stdout_only("3\n"); .stdout_only("3\n");
} }
#[ignore]
#[test] #[test]
fn test_bre11() { fn test_bre11() {
new_ucmd!() new_ucmd!()