Support += on substitution

Author: ryuichiueda

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sush"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/core/data.rs

@@ -123,6 +123,13 @@ impl Data {
         }
     }
 
+    pub fn is_array(&mut self, key: &str) -> bool {
+        match self.get_value(key) {
+            Some(Value::EvaluatedArray(_)) => true,
+            _ => false,
+        }
+    }
+
     pub fn get_position_params(&self) -> Vec<String> {
         match self.position_parameters.last() {
             Some(v) => v[1..].to_vec(),

src/elements/error

@@ -1 +1,4 @@
 ../../test/test_compound.bash
+../../test/test_others.bash
+../../test/test_others.bash
+../../test/test_others.bash

src/elements/substitution.rs

@@ -11,28 +11,39 @@ pub struct Substitution {
     pub text: String,
     pub key: String,
     pub value: Value,
+    pub append: bool,
 }
 
 impl Substitution {
     pub fn eval(&mut self, core: &mut ShellCore) -> Value {
-        match &self.value {
+        match self.value.clone() {
             Value::None      => Value::EvaluatedSingle("".to_string()),
-            Value::Single(v) => Self::eval_as_value(&v, core),
-            Value::Array(a)  => Self::eval_as_array(&mut a.clone(), core),
+            Value::Single(v) => self.eval_as_value(&v, core),
+            Value::Array(a)  => self.eval_as_array(&mut a.clone(), core),
             _                => Value::None,
         }
     }
 
-    fn eval_as_value(w: &Word, core: &mut ShellCore) -> Value {
+    fn eval_as_value(&self, w: &Word, core: &mut ShellCore) -> Value {
+        let prev = match self.append {
+            true  => core.data.get_param(&self.key),
+            false => "".to_string(),
+        };
+
         match w.eval_as_value(core) {
-            Some(s) => Value::EvaluatedSingle(s),
+            Some(s) => Value::EvaluatedSingle(prev + &s),
             None    => Value::None,
         }
     }
 
-    fn eval_as_array(a: &mut Array, core: &mut ShellCore) -> Value {
+    fn eval_as_array(&self, a: &mut Array, core: &mut ShellCore) -> Value {
+        let prev = match self.append {
+            true  => core.data.get_array_all(&self.key),
+            false => vec![],
+        };
+
         match a.eval(core) {
-            Some(values) => Value::EvaluatedArray(values),
+            Some(values) => Value::EvaluatedArray([prev, values].concat()),
             None         => Value::None,
         }
     }
@@ -42,6 +53,7 @@ impl Substitution {
             text: String::new(),
             key: String::new(),
             value: Value::None,
+            append: false,
         }
     }
 
@@ -55,7 +67,13 @@ impl Substitution {
 
         let mut name_eq = feeder.consume(len);
         ans.text += &name_eq;
+
         name_eq.pop();
+        if name_eq.ends_with("+") {
+            ans.append = true;
+            name_eq.pop();
+        }
+
         ans.key = name_eq.clone();
 
         if let Some(a) = Array::parse(feeder, core) {

src/feeder/scanner.rs

@@ -229,8 +229,10 @@ impl Feeder {
             return 0;
         }
 
-        if self.remaining.chars().nth(name_len).unwrap_or('x') == '=' {
+        if self.remaining[name_len..].starts_with("=") {
             name_len + 1
+        } else if self.remaining[name_len..].starts_with("+=") {
+            name_len + 2
         }else{
             0
         }

test/error

@@ -0,0 +1,2 @@
+../../test/test_others.bash
+../../test/test_others.bash

test/ok

@@ -4,3 +4,5 @@
 ./test_compound.bash
 ./test_others.bash
 ./test_job.bash
+../../test/test_others.bash
+../../test/test_others.bash

test/test_others.bash

@@ -472,6 +472,12 @@ res=$($com <<< 'A=${ }')
 res=$($com <<< 'A=B cd ; echo $A')
 [ "$res" == "" ] || err $LINENO
 
+res=$($com <<< 'A=aaa ; A+=bbb ; echo $A')
+[ "$res" == "aaabbb" ] || err $LINENO
+
+res=$($com <<< 'A=(aaa bbb) ; A+=(ccc ddd) ; echo ${A[@]}')
+[ "$res" == "aaa bbb ccc ddd" ] || err $LINENO
+
 # arithmetic calculation
 
 res=$($com <<< 'echo $((12345 ))aaa')