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

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     3bee8e8ccb14837ee561471759536fc7065fc330
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 14:38:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 12:19:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=3bee8e8c

Split ARITH_ASSIGN into independent tokens

It would be easier for the walker to deal with arithmetic assignment if
the ARITH_ASSIGN is splitted into independent tokens.

---
 bashast/bashast.g              |   16 ++++++++++++----
 bashast/gunit/arith_main.gunit |    9 +++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index ef87271..948b839 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -364,7 +364,7 @@ ns_str_part
 //Parts of strings, no slashes, no reserved words
 ns_str_part_no_res
 	:	num
-	|	name|OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|BOP|UOP|TEST_EXPR|'_'|TILDE|INC|DEC|ARITH_ASSIGN|ESC_CHAR|CARET;
+	|	name|OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|BOP|UOP|TEST_EXPR|'_'|TILDE|INC|DEC|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN|OR_ASSIGN|ESC_CHAR|CARET;
 //strings with no slashes, used in certain variable expansions
 ns_str	:	ns_str_part* -> ^(STRING ns_str_part*);
 //Allowable parts of double quoted strings
@@ -493,7 +493,7 @@ logicor	:	logicand (BLANK!* LOGICOR^ BLANK!* logicand)*;
 arithmetic_condition
 	:	cnd=logicor QMARK t=logicor COLON f=logicor -> ^(ARITHMETIC_CONDITION $cnd $t $f);
 arithmetic_assignment
-	:	(name BLANK!* (EQUALS^|ARITH_ASSIGN^) BLANK!*)? logicor;
+	:	(name BLANK!* (EQUALS|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN|OR_ASSIGN)^ BLANK!*)? logicor;
 //process substitution
 proc_sub:	(dir=LESS_THAN|dir=GREATER_THAN)LPAREN BLANK* clist BLANK* RPAREN -> ^(PROC_SUB $dir clist);
 //the biggie: functions
@@ -561,8 +561,16 @@ LESS_THAN	:	'<';
 GREATER_THAN	:	'>';
 LSHIFT	:	'<<';
 RSHIFT	:	'>>';
-ARITH_ASSIGN
-	:	(TIMES|SLASH|PCT|PLUS|MINUS|LSHIFT|RSHIFT|AMP|CARET|PIPE) EQUALS;
+MUL_ASSIGN	:	'*=';
+DIVIDE_ASSIGN	:	'/=';
+MOD_ASSIGN	:	'%=';
+PLUS_ASSIGN	:	'+=';
+MINUS_ASSIGN	:	'-=';
+LSHIFT_ASSIGN	:	'<<=';
+RSHIFT_ASSIGN	:	'>>=';
+AND_ASSIGN	:	'&=';
+XOR_ASSIGN	:	'^=';
+OR_ASSIGN	:	'|=';
 //some separators
 SEMIC	:	';';
 DOUBLE_SEMIC

diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gunit
index 0c39c9c..ff7f678 100644
--- a/bashast/gunit/arith_main.gunit
+++ b/bashast/gunit/arith_main.gunit
@@ -100,7 +100,16 @@ logicor:
 arithmetic_assignment:
 "13"->"13"
 "foo=5+3" -> (= foo (+ 5 3))
+"var *= 5" -> (*= var 5)
+"var /= 5" -> (/= var 5)
+"var %= 5" -> (%= var 5)
 "asdf += 5" -> (+= asdf 5)
+"var -= 5" -> (-= var 5)
+"var <<= 5" -> (<<= var 5)
+"var >>= 5" -> (>>= var 5)
+"var &= 5" -> (&= var 5)
+"var ^= 5" -> (^= var 5)
+"var |= 5" -> (|= var 5)
 
 arithmetic_condition:
 "5?7:2"->(ARITHMETIC_CONDITION 5 7 2)