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

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

commit:     330481c3c8d60d0e2456e5155b857738fc3ffa02
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Jun 11 12:15:19 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:23:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=330481c3

Parser: fix brace expansion inside bracket pattern

We now support expressions like [{a,b}-c]*. As a side benefit code
complexity is reduced.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 2db45de..10e5556 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -455,21 +455,18 @@ pattern_match_trigger
 	|	AT;
 //Pattern matching using brackets
 bracket_pattern_match
-	:	LSQUARE RSQUARE (BANG|CARET) pattern_match* RSQUARE -> ^(MATCH_ANY_EXCEPT RSQUARE pattern_match*)
-	|	LSQUARE RSQUARE pattern_match* RSQUARE -> ^(MATCH_ANY RSQUARE pattern_match*)
-	|	LSQUARE (BANG|CARET) pattern_match+ RSQUARE -> ^(MATCH_ANY_EXCEPT pattern_match+)
-	|	LSQUARE pattern_match+ RSQUARE -> ^(MATCH_ANY pattern_match+)
+	:	LSQUARE RSQUARE (BANG|CARET) pattern_match RSQUARE -> ^(MATCH_ANY_EXCEPT RSQUARE pattern_match)
+	|	LSQUARE RSQUARE pattern_match RSQUARE -> ^(MATCH_ANY RSQUARE pattern_match)
+	|	LSQUARE (BANG|CARET) pattern_match RSQUARE -> ^(MATCH_ANY_EXCEPT pattern_match)
+	|	LSQUARE pattern_match RSQUARE -> ^(MATCH_ANY pattern_match)
 	|	TIMES -> MATCH_ALL
 	|	QMARK -> MATCH_ONE;
-//allowable patterns with bracket pattern matching
 pattern_match
+	:	pattern_match_atom+;
+//allowable patterns with bracket pattern matching
+pattern_match_atom
 	:	pattern_class_match
-	|	pattern_string_part+;
-pattern_string_part
-	:	var_ref
-	|	command_sub
-	|	arithmetic_expansion
-	|	ns_str_part;
+	|	(~RSQUARE) => fname_part;
 
 //special class patterns to match: [:alpha:] etc
 pattern_class_match

diff --git a/bashast/gunit/brace.gunit b/bashast/gunit/brace.gunit
index 1930560..4d5d6a5 100644
--- a/bashast/gunit/brace.gunit
+++ b/bashast/gunit/brace.gunit
@@ -31,3 +31,4 @@ fname:
 "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)))
+"[{a,b}-c]*" -> (STRING (MATCH_ANY (BRACE_EXP (STRING a) (STRING b)) - c) MATCH_ALL)