Fix comma treatment in arith

Author: ryuichiueda

src/elements/arithmetic_expr/calculator.rs

@@ -32,11 +32,17 @@ fn bin_calc_operation(op: &str, stack: &mut Vec<Elem>, core: &mut ShellCore) ->
         Ok(v)  => v,
         Err(e) => return Err(e),
     };
+
     let left = match pop_operand(stack, core) {
         Ok(v)  => v,
         Err(e) => return Err(e),
     };
 
+    if op == "," {
+        stack.push(right);
+        return Ok(());
+    }
+
     return match (left, right) {
         (Elem::Float(fl), Elem::Float(fr)) => float::bin_calc(op, fl, fr, stack),
         (Elem::Float(fl), Elem::Integer(nr)) => float::bin_calc(op, fl, nr as f64, stack),

src/elements/arithmetic_expr/elem.rs

@@ -39,11 +39,12 @@ pub fn op_order(op: &Elem) -> u8 {
                 "|"             => 9, 
                 "&&"             => 8, 
                 "||"             => 7, 
-                _               => 2,
+                ","             => 0, 
+                _               => 2, //substitution
             }
         },
         Elem::Ternary(_, _) => 3,
-        _ => 0, 
+        _ => 1, 
     }
 }
 

src/elements/arithmetic_expr/parser.rs

@@ -162,8 +162,7 @@ impl ArithmeticExpr {
         loop {
             Self::eat_blank(feeder, &mut ans, core);
 
-            if feeder.starts_with(":")
-            || feeder.starts_with(",") {
+            if feeder.starts_with(":") {
                 break;
             }
 

src/feeder/scanner.rs

@@ -203,7 +203,7 @@ impl Feeder {
                                            ">", "=", "&", "|", "^", "/", "%"], core);
         self.scanner_one_of(&["<<=", ">>=",
             "&&", "||", "**", "==", "!=", "*=", "/=", "%=", "+=", "-=", "&=", "^=", "|=",
-            ">>", "<<", "<=", ">=", "&", "^", "=", "+", "-", "/", "*", "%", "<", ">", "|", "^"/*, ","*/])
+            ">>", "<<", "<=", ">=", "&", "^", "=", "+", "-", "/", "*", "%", "<", ">", "|", "^", ","])
     }
 
     pub fn scanner_uint(&mut self, core: &mut ShellCore) -> usize {

test/error

@@ -1,3 +1,7 @@
 ../test/test_compound.bash
 ../test/test_others.bash
 ../test/test_others.bash
+../../test/test_others.bash
+../../../test/test_others.bash
+../../../test/test_others.bash
+../../../test/test_others.bash

test/ok

@@ -8,3 +8,6 @@
 ../test/test_compound.bash
 ../test/test_compound.bash
 ../../test/test_others.bash
+../../test/test_others.bash
+../../../test/test_others.bash
+../../../test/test_others.bash

test/test_others.bash

@@ -764,6 +764,14 @@ res=$($com<<<'echo $((A=1 && B=1))')
 [ "$?" == "1" ] || err $LINENO
 [ "$res" == "" ] || err $LINENO
 
+res=$($com<<<'echo $((A=1 && (B=1) ))')
+[ "$?" == "0" ] || err $LINENO
+[ "$res" == "1" ] || err $LINENO
+
+res=$($com<<<'echo $((A=1 && (B=1, 0) ))')
+[ "$?" == "0" ] || err $LINENO
+[ "$res" == "0" ] || err $LINENO
+
 res=$($com <<< 'echo $(( 1? 20 : 30  )) $(( -5 + 5 ? 100 :  200))')
 [ "$res" == "20 200" ] || err $LINENO