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

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

commit:     f751b29c1b6a946da1aa14cdce85f31afeddda4b
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 14:18:59 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 01:29:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f751b29c

Support arithmetic assignment for variable expansion

Our parser grammar didn't support arithmetic assignment inside
variable expansion like $((${foo[5]}=3)). Now it's supported.

---
 bashast/bashast.g              |    2 +-
 bashast/gunit/arith_main.gunit |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 1ef7b1f..ca54570 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -484,7 +484,7 @@ arithmetic_assignment_opterator
 	:	EQUALS|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN|OR_ASSIGN;
 
 arithmetic_assignment
-	:	(var_name BLANK!* arithmetic_assignment_opterator^ BLANK!*)? logicor;
+	:	((var_name|arithmetic_var_ref) BLANK!* arithmetic_assignment_opterator^ BLANK!*)? logicor;
 process_substitution
 	:	(dir=LESS_THAN|dir=GREATER_THAN)LPAREN clist BLANK* RPAREN -> ^(PROCESS_SUBSTITUTION $dir clist);
 //the biggie: functions

diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gunit
index 8ead7ef..0f85d55 100644
--- a/bashast/gunit/arith_main.gunit
+++ b/bashast/gunit/arith_main.gunit
@@ -105,6 +105,9 @@ arithmetic_assignment:
 "13"->"13"
 "foo=5+3" -> (= foo (+ 5 3))
 "foo[5]=5+3" -> (= (foo 5) (+ 5 3))
+"${foo[5]}=3" -> (= (VAR_REF (VAR_REF (foo 5))) 3)
+"${foo[5]}*=3" -> (*= (VAR_REF (VAR_REF (foo 5))) 3)
+"${foo[5]}^=3" -> (^= (VAR_REF (VAR_REF (foo 5))) 3)
 "var *= 5" -> (*= var 5)
 "var /= 5" -> (/= var 5)
 "var %= 5" -> (%= var 5)