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

[Petteri Räty]

commit:     581066529adf685ca48bd7cdc2a2004a77141752
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Jun 11 13:08:39 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:35:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=58106652

Parser: fix bracket pattern match negation

The negation operator is supposed to be right after the opening left
bracket. The right bracket will come after it when it's part of the
matched characters.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 24b94f7..02a36ca 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -455,20 +455,16 @@ pattern_match_trigger
 	|	AT;
 //Pattern matching using brackets
 bracket_pattern_match
-	:	LSQUARE! bracket_pattern_match_operator
+	:	LSQUARE! bracket_pattern_match_operator^ pattern_match RSQUARE!
 	|	TIMES -> MATCH_ALL
 	|	QMARK -> MATCH_ONE;
 bracket_pattern_match_operator
-	:	RSQUARE (BANG|CARET) pattern_match RSQUARE -> ^(MATCH_ANY_EXCEPT RSQUARE pattern_match)
-	|	RSQUARE              pattern_match RSQUARE -> ^(MATCH_ANY RSQUARE pattern_match)
-	|	(BANG|CARET)         pattern_match RSQUARE -> ^(MATCH_ANY_EXCEPT pattern_match)
-	|	                     pattern_match RSQUARE -> ^(MATCH_ANY pattern_match);
-pattern_match
-	:	pattern_match_atom+;
+	:	(BANG) => BANG -> MATCH_ANY_EXCEPT
+	|	(CARET) => CARET -> MATCH_ANY_EXCEPT
+	|	-> MATCH_ANY;
 //allowable patterns with bracket pattern matching
-pattern_match_atom
-	:	pattern_class_match
-	|	(~RSQUARE) => fname_part;
+pattern_match
+	:	(pattern_class_match|fname_part) (pattern_class_match| (~RSQUARE) => fname_part)*;
 
 //special class patterns to match: [:alpha:] etc
 pattern_class_match

diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit
index 799570d..621b29d 100644
--- a/bashast/gunit/fname.gunit
+++ b/bashast/gunit/fname.gunit
@@ -56,6 +56,7 @@ fname:
 "ab[!d-h]" -> (STRING ab (MATCH_ANY_EXCEPT d - h))
 "ab[^d-h]" -> (STRING ab (MATCH_ANY_EXCEPT d - h))
 "ab[]c]" -> (STRING ab (MATCH_ANY ] c))
+"ab[]!]" -> (STRING ab (MATCH_ANY ] !))
 "ab[:alpha:]" -> (STRING ab (MATCH_ANY : alpha :))
 "ab[=c=]" -> (STRING ab (MATCH_ANY = c =))
 "ab[.c.]" -> (STRING ab (MATCH_ANY . c .))