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

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

commit:     b5c3aeace9f791de74b93c35c2118cc67f8db0f1
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Thu Apr  7 09:10:11 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 16:39:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b5c3aeac

Use negation to simplify sqstr rule

Instead of listing all the alternatives use negation to find out where
the single quoted string ends.

---
 bashast/bashast.g |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 7126bdd..3d52c27 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -372,10 +372,6 @@ ns_str	:	ns_str_part* -> ^(STRING ns_str_part*);
 dq_str_part
 	:	BLANK|EOL|AMP|LOGICAND|LOGICOR|LESS_THAN|GREATER_THAN|PIPE|SQUOTE|SEMIC|COMMA|LPAREN|RPAREN|LLPAREN|RRPAREN|DOUBLE_SEMIC|LBRACE|RBRACE|TICK|LEQ|GEQ
 	|	str_part_with_pound;
-//Allowable parts of single quoted strings
-sq_str_part
-	:	str_part_with_pound
-	|	BLANK|EOL|AMP|LOGICAND|LOGICOR|LESS_THAN|GREATER_THAN|PIPE|QUOTE|SEMIC|COMMA|LPAREN|RPAREN|LLPAREN|RRPAREN|DOUBLE_SEMIC|LBRACE|RBRACE|DOLLAR|TICK|BOP|UOP;
 //Generic strings/filenames.
 fname	:	nqstr -> ^(STRING nqstr);
 //A string that is NOT a bash reserved word
@@ -411,7 +407,9 @@ dqstr_part
 	|	pattern_match_trigger
 	|	BANG;
 //single quoted string rule, no expansions
-sqstr	:	SQUOTE sq_str_part* SQUOTE -> ^(SINGLE_QUOTED_STRING sq_str_part*);
+sqstr_part
+	: ~SQUOTE*;
+sqstr	:	SQUOTE sqstr_part SQUOTE -> ^(SINGLE_QUOTED_STRING sqstr_part);
 //certain tokens that trigger pattern matching
 pattern_match_trigger
 	:	LSQUARE