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

[Petteri Räty]

commit:     3316cbc65d294bd54022a86ed86433ae7a65fc93
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 09:25:00 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 06:12:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=3316cbc6

Parser: fix brace expansion

We need to support expansions like {$a/$b,c}. The previous
implementation can not match $a/$b as a whole string. Now it's fixed.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 88a44cf..104dd36 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -180,10 +180,8 @@ brace_expansion_inside
 range	:	DIGIT DOTDOT^ DIGIT
 	|	LETTER DOTDOT^ LETTER;
 brace_expansion_part
-	:	brace_expansion
-	|	((~COMMA) => fname_part)+ -> ^(STRING fname_part+)
-	|	var_ref
-	|	command_sub
+	:	(((~COMMA) => fname_part)+ -> ^(STRING fname_part+))+
+	|	brace_expansion
 	|	-> EMPTY_BRACE_EXPANSION_ATOM;
 commasep:	brace_expansion_part(COMMA! brace_expansion_part)+;
 command_sub

diff --git a/bashast/gunit/brace.gunit b/bashast/gunit/brace.gunit
index c9a7ba9..584face 100644
--- a/bashast/gunit/brace.gunit
+++ b/bashast/gunit/brace.gunit
@@ -20,6 +20,7 @@ gunit bashast;
 
 brace_expansion:
 "{a,b}"-> (BRACE_EXP (STRING a) (STRING b))
+"{$a/$b,b}"-> (BRACE_EXP (STRING (VAR_REF a) / (VAR_REF b)) (STRING b))
 "{a,b,c}" -> (BRACE_EXP (STRING a) (STRING b) (STRING c))
 "{a..d}" -> (BRACE_EXP (.. a d))
 "{{a,b},c,d}" -> (BRACE_EXP (BRACE_EXP (STRING a) (STRING b)) (STRING c) (STRING d))