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

expr: fix substr parsing

Browse source
This commit is contained in:
Tomasz Guz 2025-06-11 22:12:42 +02:00
parent 83424751c1
commit 6049bc091a
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -685,9 +685,9 @@ impl<'a, S: AsRef<str>> Parser<'a, S> {
} }
} }
"substr" => { "substr" => {
let string = self.parse_expression()?; let string = self.parse_simple_expression()?;
let pos = self.parse_expression()?; let pos = self.parse_simple_expression()?;
let length = self.parse_expression()?; let length = self.parse_simple_expression()?;
AstNodeInner::Substr { AstNodeInner::Substr {
string: Box::new(string), string: Box::new(string),
pos: Box::new(pos), pos: Box::new(pos),

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

@ -507,6 +507,19 @@ fn test_substr() {
.stderr_only("expr: syntax error: unexpected argument 'substr'\n"); .stderr_only("expr: syntax error: unexpected argument 'substr'\n");
} }
#[test]
fn test_substr_precedence() {
new_ucmd!()
.args(&["substr", "ab cd", "3", "1", "!=", " "])
.fails_with_code(1)
.stdout_only("0\n");
new_ucmd!()
.args(&["substr", "ab cd", "2", "1", "!=", " "])
.succeeds()
.stdout_only("1\n");
}
#[test] #[test]
fn test_invalid_substr() { fn test_invalid_substr() {
new_ucmd!() new_ucmd!()