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

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

commit:     32ea83a17790cfc700bce50cd91b8aa2129a6014
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Apr 16 12:43:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:57:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=32ea83a1

Parser: empty atoms in brace expansion

With expressions like README{.txt,} you can expand to the word with and
without the extension. We now parse these expressions and mark the
result in the AST with a virtual token.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 468a460..b318f3c 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -29,6 +29,7 @@ tokens{
 	ARRAY;
 	ARRAY_SIZE;
 	BRACE_EXP;
+	EMPTY_BRACE_EXPANSION_ATOM;
 	COMMAND_SUB;
 	CASE_PATTERN;
 	SUBSHELL;
@@ -162,7 +163,8 @@ brace_expansion_part
 	:	brace_expansion
 	|	((~COMMA) => fname_part)+ -> ^(STRING fname_part+)
 	|	var_ref
-	|	command_sub;
+	|	command_sub
+	|	-> EMPTY_BRACE_EXPANSION_ATOM;
 commasep:	brace_expansion_part(COMMA! brace_expansion_part)+;
 command_sub
 	:	DOLLAR LPAREN BLANK* pipeline BLANK? RPAREN -> ^(COMMAND_SUB pipeline)

diff --git a/bashast/gunit/brace.gunit b/bashast/gunit/brace.gunit
index 2030d58..c9a7ba9 100644
--- a/bashast/gunit/brace.gunit
+++ b/bashast/gunit/brace.gunit
@@ -23,6 +23,7 @@ brace_expansion:
 "{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))
+"{.txt,,}" -> (BRACE_EXP (STRING . txt) EMPTY_BRACE_EXPANSION_ATOM EMPTY_BRACE_EXPANSION_ATOM)
 
 fname:
 "a{b,c}" -> (STRING a (BRACE_EXP (STRING b) (STRING c)))