[gentoo-commits] proj/libbash:master commit in: src/core/, bashast/, test/

[Petteri Räty]

commit:     ae0f0d679f455f3529fc105afd3202bfd77103d7
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 13:20:39 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 13:47:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=ae0f0d67

Return the value of arithmetic assignment expression

The return value of arithmetic assignment expression should be
equal to the new value of the variable that got assigned.

---
 bashast/libbashWalker.g |   25 ++++++++++++++-----------
 src/core/interpreter.h  |    7 +++++--
 test/walker_test.cpp    |   40 ++++++++++++++++++++++------------------
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index f7ed4ab..fc65689 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -79,36 +79,39 @@ arithmetics returns[int value]
 	|^(PRE_DECR libbash_name=name){ $value = walker->pre_decr(libbash_name); }
 	|^(POST_INCR libbash_name=name){ $value = walker->post_incr(libbash_name); }
 	|^(POST_DECR libbash_name=name){ $value = walker->post_decr(libbash_name); }
-	|^(EQUALS libbash_name=name l=arithmetics) { walker->set_value(libbash_name, l); }
+	|^(EQUALS libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name, l);
+		$value = l;
+	}
 	|^(MUL_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::multiply, libbash_name, l);
+		$value = walker->assign(&interpreter::multiply, libbash_name, l);
 	}
 	|^(DIVIDE_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::divide, libbash_name, l);
+		$value = walker->assign(&interpreter::divide, libbash_name, l);
 	}
 	|^(MOD_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::mod, libbash_name, l);
+		$value = walker->assign(&interpreter::mod, libbash_name, l);
 	}
 	|^(PLUS_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::plus, libbash_name, l);
+		$value = walker->assign(&interpreter::plus, libbash_name, l);
 	}
 	|^(MINUS_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::minus, libbash_name, l);
+		$value = walker->assign(&interpreter::minus, libbash_name, l);
 	}
 	|^(LSHIFT_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::left_shift, libbash_name, l);
+		$value = walker->assign(&interpreter::left_shift, libbash_name, l);
 	}
 	|^(RSHIFT_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::right_shift, libbash_name, l);
+		$value = walker->assign(&interpreter::right_shift, libbash_name, l);
 	}
 	|^(AND_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::bitwiseand, libbash_name, l);
+		$value = walker->assign(&interpreter::bitwiseand, libbash_name, l);
 	}
 	|^(XOR_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::bitwisexor, libbash_name, l);
+		$value = walker->assign(&interpreter::bitwisexor, libbash_name, l);
 	}
 	|^(OR_ASSIGN libbash_name=name l=arithmetics) {
-		walker->assign(&interpreter::bitwiseor, libbash_name, l);
+		$value = walker->assign(&interpreter::bitwiseor, libbash_name, l);
 	}
 	| NUMBER { $value = walker->parse_int($NUMBER);}
 	| DIGIT { $value = walker->parse_int($DIGIT);}

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 81e0837..6c99815 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -294,9 +294,12 @@ public:
   /// \param a function object to do an operation while assigning
   /// \param the name of the variable
   /// \param the value to assign
-  void assign(std::function<int(int,int)> f, const std::string& name, int value)
+  /// \return the new value of the variable
+  int assign(std::function<int(int,int)> f, const std::string& name, int value)
   {
-    set_value(name,f(resolve<int>(name), value));
+    int new_value = f(resolve<int>(name), value);
+    set_value(name, new_value);
+    return new_value;
   }
 
   /// \brief resolve any variable

diff --git a/test/walker_test.cpp b/test/walker_test.cpp
index 66ae75d..41720ad 100644
--- a/test/walker_test.cpp
+++ b/test/walker_test.cpp
@@ -66,10 +66,14 @@ public:
     return treePsr->arithmetics(treePsr);
   }
 
-  int get_arithmetic_variable(const char* script, const string& name)
+  void check_arithmetic_assignment(const char* script,
+                                   const string& name,
+                                   int exp_value)
   {
-    run_arithmetic(script);
-    return walker->resolve<int>(name);
+    // the return value of the arithmetic expression should be equal to
+    // the new value of the variable
+    EXPECT_EQ(exp_value, run_arithmetic(script));
+    EXPECT_EQ(exp_value, walker->resolve<int>(name));
   }
 };
 
@@ -162,19 +166,19 @@ TEST_BINARY_ARITHMETIC(complex_cal,         "10*(2+5)<<3%2**5", 560)
 TEST_BINARY_ARITHMETIC(complex_cal2,        "10*${value}<<3%2**5", 8000)
 TEST_BINARY_ARITHMETIC(complex_cal3,        "(20&5|3||1*100-20&5*10)+~(2*5)", -10)
 
-#define TEST_INT_VARIABLE_VALUE(name, script, var_name, exp_value)\
+#define TEST_ARITHMETIC_ASSIGNMENT(name, script, var_name, exp_value)\
   TEST_F(walker_test, name) \
-  { EXPECT_EQ(exp_value, get_arithmetic_variable(script, var_name)); }
-
-TEST_INT_VARIABLE_VALUE(assignment,             "new_var=10",   "new_var",      10)
-TEST_INT_VARIABLE_VALUE(assignment2,            "value=10+5/2", "value",        12)
-TEST_INT_VARIABLE_VALUE(mul_assignment,         "value*=10",    "value",        1000)
-TEST_INT_VARIABLE_VALUE(divide_assignment,      "value/=10",    "value",        10)
-TEST_INT_VARIABLE_VALUE(mod_assignment,         "value%=9",     "value",        1)
-TEST_INT_VARIABLE_VALUE(plus_assignment,        "value+=10",    "value",        110)
-TEST_INT_VARIABLE_VALUE(minus_assignment,       "value-=10",    "value",        90)
-TEST_INT_VARIABLE_VALUE(left_shift_assignment,  "value<<=2",    "value",        400)
-TEST_INT_VARIABLE_VALUE(right_shift_assignment, "value>>=2",    "value",        25)
-TEST_INT_VARIABLE_VALUE(and_assignment,         "value&=10",    "value",        0)
-TEST_INT_VARIABLE_VALUE(xor_assignment,         "value^=5",     "value",        97)
-TEST_INT_VARIABLE_VALUE(or_assignment,          "value|=10",    "value",        110)
+  { check_arithmetic_assignment(script, var_name, exp_value); }
+
+TEST_ARITHMETIC_ASSIGNMENT(assignment,             "new_var=10",   "new_var",      10)
+TEST_ARITHMETIC_ASSIGNMENT(assignment2,            "value=10+5/2", "value",        12)
+TEST_ARITHMETIC_ASSIGNMENT(mul_assignment,         "value*=10",    "value",        1000)
+TEST_ARITHMETIC_ASSIGNMENT(divide_assignment,      "value/=10",    "value",        10)
+TEST_ARITHMETIC_ASSIGNMENT(mod_assignment,         "value%=9",     "value",        1)
+TEST_ARITHMETIC_ASSIGNMENT(plus_assignment,        "value+=10",    "value",        110)
+TEST_ARITHMETIC_ASSIGNMENT(minus_assignment,       "value-=10",    "value",        90)
+TEST_ARITHMETIC_ASSIGNMENT(left_shift_assignment,  "value<<=2",    "value",        400)
+TEST_ARITHMETIC_ASSIGNMENT(right_shift_assignment, "value>>=2",    "value",        25)
+TEST_ARITHMETIC_ASSIGNMENT(and_assignment,         "value&=10",    "value",        0)
+TEST_ARITHMETIC_ASSIGNMENT(xor_assignment,         "value^=5",     "value",        97)
+TEST_ARITHMETIC_ASSIGNMENT(or_assignment,          "value|=10",    "value",        110)