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

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

commit:     95c2c86fdd4a52250393e05bbe5648367d5759ee
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr  8 18:57:03 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 06:13:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=95c2c86f

Improve brace expansion

The parser assumed brace expansion could only happen once for a word but
this not the case. Writing a{a,b}b{c,d} is valid bash and expands to
four words.

---
 bashast/bashast.g              |   15 ++++++---------
 bashast/gunit/brace.gunit      |   19 +++++++++----------
 bashast/gunit/expansions.gunit |    2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index bf07b7f..5214b65 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -27,7 +27,6 @@ options
 tokens{
 	ARG;
 	ARRAY;
-	BRACE;
 	BRACE_EXP;
 	COMMAND_SUB;
 	CASE_PATTERN;
@@ -111,8 +110,7 @@ bash_command
 	:	fname_no_res_word (BLANK+ arg)* -> ^(COMMAND fname_no_res_word arg*);
 //An argument to a command
 arg
-	:	brace_expansion
-	|	var_ref
+	:	var_ref
 	|	fname
 	|	command_sub
 	|	var_ref;
@@ -144,16 +142,14 @@ redir_op:	AMP LESS_THAN -> OP["&<"]
 	|	GREATER_THAN
 	|	DIGIT redir_op;
 brace_expansion
-	:	pre=fname? brace post=fname? -> ^(BRACE_EXP ($pre)? brace ($post)?);
-brace
-	:	LBRACE BLANK* brace_expansion_inside BLANK?RBRACE -> ^(BRACE brace_expansion_inside);
+	:	LBRACE BLANK* brace_expansion_inside BLANK* RBRACE -> ^(BRACE_EXP brace_expansion_inside);
 brace_expansion_inside
 	:	commasep|range;
 range	:	DIGIT DOTDOT^ DIGIT
 	|	LETTER DOTDOT^ LETTER;
 brace_expansion_part
-	:	fname
-	|	brace
+	:	brace_expansion
+	|	fname
 	|	var_ref
 	|	command_sub;
 commasep:	brace_expansion_part(COMMA! brace_expansion_part)+;
@@ -388,13 +384,14 @@ no_res_word_part
 	|	var_ref
 	|	command_sub
 	|	arithmetic_expansion
+	|	brace_expansion
 	|	dqstr
 	|	sqstr
 	|	ns_str_part_no_res
 	|	SLASH
 	|	pattern_match_trigger;
 //non-quoted string rule, allows expansions
-nqstr	:	(bracket_pattern_match|extended_pattern_match|var_ref|command_sub|arithmetic_expansion|dqstr|sqstr|(str_part str_part_with_pound*)|pattern_match_trigger|BANG)+;
+nqstr	:	(bracket_pattern_match|extended_pattern_match|var_ref|command_sub|arithmetic_expansion|brace_expansion|dqstr|sqstr|(str_part str_part_with_pound*)|pattern_match_trigger|BANG)+;
 //double quoted string rule, allows expansions
 dqstr	:	QUOTE dqstr_part* QUOTE -> ^(DOUBLE_QUOTED_STRING dqstr_part*);
 dqstr_part

diff --git a/bashast/gunit/brace.gunit b/bashast/gunit/brace.gunit
index a5a5620..937e594 100644
--- a/bashast/gunit/brace.gunit
+++ b/bashast/gunit/brace.gunit
@@ -18,14 +18,13 @@
 */
 gunit bashast;
 
-brace:
-"{a,b}"-> (BRACE (STRING a) (STRING b))
-"{a,b,c}" -> (BRACE (STRING a) (STRING b) (STRING c))
-"{a..d}" -> (BRACE (.. a d))
-"{{a,b},c,d}" -> (BRACE (BRACE (STRING a) (STRING b)) (STRING c) (STRING d))
-
 brace_expansion:
-"{a,b}" -> (BRACE_EXP (BRACE (STRING a) (STRING b)))
-"a{b,c}" -> (BRACE_EXP (STRING a) (BRACE (STRING b) (STRING c)))
-"{c..d}f" -> (BRACE_EXP (BRACE (.. c d)) (STRING f))
-"z{{a,b},c}" -> (BRACE_EXP (STRING z) (BRACE (BRACE (STRING a) (STRING b)) (STRING c)))
+"{a,b}"-> (BRACE_EXP (STRING a) (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))
+
+arg:
+"a{b,c}" -> (STRING a (BRACE_EXP (STRING b) (STRING c)))
+"{c..d}f" -> (STRING (BRACE_EXP (.. c d)) f)
+"a{a,b}b{c,d}" -> (STRING a (BRACE_EXP (STRING a) (STRING b)) b (BRACE_EXP (STRING c) (STRING d)))

diff --git a/bashast/gunit/expansions.gunit b/bashast/gunit/expansions.gunit
index 2bce986..252c6bf 100644
--- a/bashast/gunit/expansions.gunit
+++ b/bashast/gunit/expansions.gunit
@@ -19,7 +19,7 @@
 gunit bashast;
 
 list:
-"echo a{b,c,d}" -> (LIST (COMMAND (STRING echo) (BRACE_EXP (STRING a) (BRACE (STRING b) (STRING c) (STRING d)))))
+"echo a{b,c,d}" -> (LIST (COMMAND (STRING echo) (STRING a (BRACE_EXP (STRING b) (STRING c) (STRING d)))))
 "((5+5))" -> (LIST (COMPOUND_ARITH (+ 5 5)))
 "(( 4 + $asdf ))" -> (LIST (COMPOUND_ARITH (+ 4 (VAR_REF asdf))))
 "[[ while=while ]] && echo true" -> (LIST (&& (COMPOUND_COND (KEYWORD_TEST (= (STRING while) (STRING while)))) (COMMAND (STRING echo) (STRING true))))