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

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

commit:     351f71b0267b090cc5825fafeb9eef6ee102169f
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr 15 12:53:58 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:44:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=351f71b0

Parser: other expansions inside pathname expansion

Pathname expansions like configu[e${a}] are now supported.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 4bd3447..d5c3415 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -413,7 +413,13 @@ bracket_pattern_match
 //allowable patterns with bracket pattern matching
 pattern_match
 	:	pattern_class_match
-	|	str_part str_part_with_pound*;
+	|	pattern_string_part+;
+pattern_string_part
+	:	var_ref
+	|	command_sub
+	|	arithmetic_expansion
+	|	ns_str_part;
+
 //special class patterns to match: [:alpha:] etc
 pattern_class_match
 	:	LSQUARE COLON NAME COLON RSQUARE -> ^(CHARACTER_CLASS NAME)

diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit
index e783504..eb8f080 100644
--- a/bashast/gunit/fname.gunit
+++ b/bashast/gunit/fname.gunit
@@ -48,6 +48,7 @@ fname:
 "ctrlx\cx" -> (STRING ctrlx \ cx)
 "tab\\ttab" -> "(STRING tab \\ \t tab)"
 "abc[def]" -> (STRING abc (MATCH_PATTERN def))
+"abc[d${more}]" -> (STRING abc (MATCH_PATTERN d (VAR_REF more)))
 "a[]" -> (STRING a [ ])
 "ab[d-h]" -> (STRING ab (MATCH_PATTERN d - h))
 "ab[!d-h]" -> (STRING ab (MATCH_ANY_EXCEPT d - h))