Implement < and >

shellgei · Sep 22, 2024 · c2ab60f · c2ab60f
1 parent 40ff865
commit c2ab60f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/elements/expr/conditional.rs b/src/elements/expr/conditional.rs
@@ -215,10 +215,12 @@ impl ConditionalExpr {
             Err(e) => return Err(e),
         };
 
-        if op == "==" || op == "=" || op == "!=" {
+        if op == "==" || op == "=" || op == "!=" || op == "<" || op == ">" {
             let ans = match op {
                 "==" | "=" => left == right,
                 "!="       => left != right,
+                ">"        => left > right,
+                "<"        => left < right,
                 _    => false,
             };
 

diff --git a/src/feeder/scanner.rs b/src/feeder/scanner.rs
@@ -295,6 +295,6 @@ 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", "==", "=", "!=", "<", ">"])
     }
 }
diff --git a/test/ok b/test/ok
@@ -11,3 +11,6 @@
 ../../../test/test_compound.bash
 ../../../test/test_compound.bash
 ../../../test/test_compound.bash
+../../../test/test_compound.bash
+../../../test/test_compound.bash
+../../../test/test_compound.bash
diff --git a/test/test_compound.bash b/test/test_compound.bash
@@ -865,7 +865,10 @@ res=$($com -c 'A=あいう ; [[ != $A ]]')
 res=$($com -c '[[ aaa != ]]')
 [ "$?" = "2" ] || err $LINENO
 
-res=$($com -c '[[  ==  ]] && [[ = ]] && [[ != ]]')
+$com -c '[[  ==  ]] && [[ = ]] && [[ != ]]'
+[ "$?" = "0" ] || err $LINENO
+
+$com -c '[[ abc > aaa ]] && [[ 0100 < 2 ]] && [[ ! abc > abc ]]'
 [ "$?" = "0" ] || err $LINENO
 
 # and or