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

[Petteri Räty]

commit:     9d9afb2e878d6104f76e958958eec6168923181f
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 14:57:56 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 12:19:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=9d9afb2e

Implement arithmetic assignment

All the arithmetic assignment operations are supported.

---
 bashast/bashwalker.g |   40 ++++++++++++++++++++++++++++++++++++++++
 test/walker_test.cpp |   10 ++++++++++
 2 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/bashast/bashwalker.g b/bashast/bashwalker.g
index 16d1216..d2c2438 100644
--- a/bashast/bashwalker.g
+++ b/bashast/bashwalker.g
@@ -80,6 +80,46 @@ arithmetics returns[int value]
 	|^(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); }
+	|^(MUL_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->multiply(walker->resolve<int>(libbash_name), l));
+	}
+	|^(DIVIDE_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->divide(walker->resolve<int>(libbash_name), l));
+	}
+	|^(MOD_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->mod(walker->resolve<int>(libbash_name), l));
+	}
+	|^(PLUS_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->plus(walker->resolve<int>(libbash_name), l));
+	}
+	|^(MINUS_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->minus(walker->resolve<int>(libbash_name), l));
+	}
+	|^(LSHIFT_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->left_shift(walker->resolve<int>(libbash_name), l));
+	}
+	|^(RSHIFT_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->right_shift(walker->resolve<int>(libbash_name), l));
+	}
+	|^(AND_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->bitwiseand(walker->resolve<int>(libbash_name), l));
+	}
+	|^(XOR_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->bitwisexor(walker->resolve<int>(libbash_name), l));
+	}
+	|^(OR_ASSIGN libbash_name=name l=arithmetics) {
+		walker->set_value(libbash_name,
+						  walker->bitwiseor(walker->resolve<int>(libbash_name), l));
+	}
 	| NUMBER { $value = walker->parse_int($NUMBER);}
 	| DIGIT { $value = walker->parse_int($DIGIT);}
 	;

diff --git a/test/walker_test.cpp b/test/walker_test.cpp
index 0a74b10..98672aa 100644
--- a/test/walker_test.cpp
+++ b/test/walker_test.cpp
@@ -168,3 +168,13 @@ TEST_BINARY_ARITHMETIC(complex_cal3,        "(20&5|3||1*100-20&5*10)+~(2*5)", -1
 
 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)