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

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

commit:     bb8cda9be17650ba4006fca9bae3274a4e55a809
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Thu Jun  9 14:14:33 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 14:44:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=bb8cda9b

Parser: handle appending to arrays

The parser couldn't handle array+=(a b c) syntax.

---
 bashast/bashast.g         |    7 ++++---
 bashast/gunit/array.gunit |    3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index af5cfcf..a8d44d5 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -244,13 +244,14 @@ cond_comparison
 var_def
 	:	name LSQUARE BLANK? explicit_arithmetic BLANK* RSQUARE EQUALS fname? -> ^(EQUALS ^(name explicit_arithmetic) fname?)
 	|	name EQUALS^ value?
+	|	name PLUS_ASSIGN array_value -> ^(PLUS_ASSIGN name array_value)
 	|	name PLUS_ASSIGN fname_part? -> ^(EQUALS name ^(STRING ^(VAR_REF name) fname_part?));
 //Possible values of a variable
 value	:	fname
-	|	LPAREN! wspace!* arr_val RPAREN!;
+	|	array_value;
 //allow the parser to create array variables
-arr_val	:
-	|	(ag+=array_atom wspace*)+ -> ^(ARRAY $ag+);
+array_value
+	:	LPAREN wspace* (array_atom wspace*)* RPAREN -> ^(ARRAY array_atom*);
 array_atom
 	:	(LSQUARE) => LSQUARE! BLANK!* explicit_arithmetic BLANK!? RSQUARE! EQUALS^ fname
 	|	fname;

diff --git a/bashast/gunit/array.gunit b/bashast/gunit/array.gunit
index caa2615..eb11be8 100644
--- a/bashast/gunit/array.gunit
+++ b/bashast/gunit/array.gunit
@@ -26,6 +26,9 @@ var_def:
 		--disable-dependency-tracking
 		${VAR}
 )" -> (= asdf (ARRAY (STRING - - disable - dependency - tracking) (STRING (VAR_REF VAR))))
+"asdf=()" -> (= asdf ARRAY)
+"asdf+=()" -> (+= asdf ARRAY)
+"asdf+=(a)" -> (+= asdf (ARRAY (STRING a)))
 
 var_ref:
 "$asdf" -> (VAR_REF asdf)