Enable to scan -eq, -ne, ...

shellgei · Sep 22, 2024 · 090f1c4 · 090f1c4
1 parent c2ab60f
commit 090f1c4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/elements/expr/conditional.rs b/src/elements/expr/conditional.rs
@@ -228,6 +228,19 @@ impl ConditionalExpr {
             return Ok(());
         }
 
+        if op == "-eq" || op == "-ne" || op == "-lt" || op == "-le" || op == "-gt" || op == "-ge" {
+            let ans = match op {
+                "==" | "=" => left == right,
+                "!="       => left != right,
+                ">"        => left > right,
+                "<"        => left < right,
+                _    => false,
+            };
+
+            stack.push( Elem::Ans(ans) );
+            return Ok(());
+        }
+
         let result = file_check::metadata_comp(&left, &right, op);
         stack.push( Elem::Ans(result) );
         Ok(())

diff --git a/src/feeder/scanner.rs b/src/feeder/scanner.rs
@@ -295,6 +295,7 @@ impl Feeder {
 
     pub fn scanner_test_compare_op(&mut self, core: &mut ShellCore) -> usize {
         self.backslash_check_and_feed(vec!["-", "-e", "-n", "-o", "=", "!"], core);
-        self.scanner_one_of(&["-ef", "-nt", "-ot", "==", "=", "!=", "<", ">"])
+        self.scanner_one_of(&["-ef", "-nt", "-ot", "==", "=", "!=", "<", ">",
+                              "-eq", "-ne", "-lt", "-le", "-gt", "-ge"])
     }
 }
diff --git a/test/error b/test/error
@@ -1,4 +0,0 @@
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash

diff --git a/test/ok b/test/ok
@@ -4,13 +4,3 @@
 ./test_compound.bash
 ./test_others.bash
 ./test_job.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash
-../../../test/test_compound.bash