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

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

commit:     92991956bc72f52f0a6cfcadef8019c446f45892
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 08:50:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 15:09:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=92991956

Split parameter expansion rule

It's easier for the walker to handle if we split the parameter
expansion rule into independent rules.

---
 bashast/bashast.g |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index d83b616..2659ef5 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -253,7 +253,7 @@ var_ref
 	|	DOLLAR BANG -> ^(VAR_REF BANG)
 	|	DOLLAR '_' -> ^(VAR_REF '_');
 //Variable expansions
-var_exp	:	var_name WORDOP^ word
+var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ word
 	|	var_name COLON os=num (COLON len=num)? -> ^(OFFSET var_name $os ^($len)?)
 	|	BANG^ var_name (TIMES|AT)
 	|	BANG var_name LSQUARE (op=TIMES|op=AT) RSQUARE -> ^(LIST_EXPAND var_name $op)
@@ -600,7 +600,10 @@ POUNDPOUND
 PCT	:	'%';
 PCTPCT	:	'%%';
 SLASH	:	'/';
-WORDOP	:	(':-'|':='|':?'|':+');
+USE_DEFAULT	:	':-';
+ASSIGN_DEFAULT:	':=';
+DISPLAY_ERROR:	':?';
+USE_ALTERNATE:	':+';
 COLON	:	':';
 QMARK	:	'?';
 //Operators for conditional statements