Merge pull request #5566 from Luv-Ray/fix-expr-issue5560

cakebaker · web-flow · commit dbb29ec40099 · 2023-11-21T16:30:45.000+01:00
`expr`: check prefix operation
diff --git a/src/uu/expr/src/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs
@@ -332,8 +332,12 @@ fn push_token_to_either_stack(
         }
 
         Token::PrefixOp { .. } | Token::ParOpen => {
-            op_stack.push((token_idx, token.clone()));
-            Ok(())
+            if out_stack.is_empty() {
+                op_stack.push((token_idx, token.clone()));
+                Ok(())
+            } else {
+                Err(String::from("syntax error (operation should be prefix)"))
+            }
         }
 
         Token::ParClose => move_till_match_paren(out_stack, op_stack),
diff --git a/tests/by-util/test_expr.rs b/tests/by-util/test_expr.rs
@@ -100,6 +100,11 @@ fn test_parenthesis() {
         .args(&["(", "1", "+", "1", ")", "*", "2"])
         .succeeds()
         .stdout_only("4\n");
+
+    new_ucmd!()
+        .args(&["1", "(", ")"])
+        .fails()
+        .stderr_only("expr: syntax error (operation should be prefix)\n");
 }
 
 #[test]
@@ -221,6 +226,11 @@ fn test_index() {
         .args(&["index", "αbcdef_f", "f"])
         .succeeds()
         .stdout_only("6\n");
+
+    new_ucmd!()
+        .args(&["αbcdef", "index", "α"])
+        .fails()
+        .stderr_only("expr: syntax error (operation should be prefix)\n");
 }
 
 #[test]
@@ -234,6 +244,11 @@ fn test_length() {
         .args(&["length", "abcdef"])
         .succeeds()
         .stdout_only("6\n");
+
+    new_ucmd!()
+        .args(&["abcdef", "length"])
+        .fails()
+        .stderr_only("expr: syntax error (operation should be prefix)\n");
 }
 
 #[test]
@@ -271,6 +286,11 @@ fn test_substr() {
         .args(&["substr", "abc", "1", "1"])
         .succeeds()
         .stdout_only("a\n");
+
+    new_ucmd!()
+        .args(&["abc", "substr", "1", "1"])
+        .fails()
+        .stderr_only("expr: syntax error (operation should be prefix)\n");
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -332,8 +332,12 @@ fn push_token_to_either_stack(`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`Token::PrefixOp { .. } \| Token::ParOpen => {`
`335`		`- op_stack.push((token_idx, token.clone()));`
`336`		`- Ok(())`
	`335`	`+ if out_stack.is_empty() {`
	`336`	`+ op_stack.push((token_idx, token.clone()));`
	`337`	`+ Ok(())`
	`338`	`+ } else {`
	`339`	`+ Err(String::from("syntax error (operation should be prefix)"))`
	`340`	`+ }`
`337`	`341`	`}`
`338`	`342`
`339`	`343`	`Token::ParClose => move_till_match_paren(out_stack, op_stack),`