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

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

commit:     a8be914d2ff0ff3516ed0ea1e9d775ba57c3c47d
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 12:24:09 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun May 22 16:11:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=a8be914d

Parser: use tokens instead of "OP" for keyword test

OP["!="] can't be understand by the walker grammar so we use virtual
a token instead. "!=" and "==" trigger bash pattern matching.

---
 bashast/bashast.g             |    6 ++++--
 bashast/gunit/cond_main.gunit |    4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index c4156ec..2a8e20b 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -68,6 +68,8 @@ tokens{
 	EXTENDED_MATCH_NONE;
 	EXTENDED_MATCH_ANY;
 	EXTENDED_MATCH_AT_LEAST_ONE;
+	MATCH_PATTERN;
+	NOT_MATCH_PATTERN;
 	MATCH_ANY;
 	MATCH_ANY_EXCEPT;
 	MATCH_ALL;
@@ -354,9 +356,9 @@ negate_builtin_primary
 	:	BANG BLANK+ builtin_cond_primary -> ^(NEGATION builtin_cond_primary);
 binary_str_op_keyword
 	:	bop
-	|	EQUALS EQUALS -> OP["=="]
+	|	EQUALS EQUALS -> MATCH_PATTERN
 	|	EQUALS
-	|	BANG EQUALS -> OP["!="]
+	|	BANG EQUALS -> NOT_MATCH_PATTERN
 	|	LESS_THAN
 	|	GREATER_THAN;
 binary_string_op_builtin

diff --git a/bashast/gunit/cond_main.gunit b/bashast/gunit/cond_main.gunit
index 78ebbf9..eeef052 100644
--- a/bashast/gunit/cond_main.gunit
+++ b/bashast/gunit/cond_main.gunit
@@ -22,7 +22,9 @@ cond_expr:
 "[[ -a this/is.afile ]]" -> (KEYWORD_TEST (a (STRING this / is . afile)))
 "[ -n \"yar53\" ]" -> (BUILTIN_TEST (n (STRING (DOUBLE_QUOTED_STRING yar53))))
 "test 5 -eq 6" -> (BUILTIN_TEST (eq (STRING 5) (STRING 6)))
-"[[ \"asdf\" != \"boo\" && -a filename ]]" -> (KEYWORD_TEST (&& (!= (STRING (DOUBLE_QUOTED_STRING asdf)) (STRING (DOUBLE_QUOTED_STRING boo))) (a (STRING filename))))
+"[[ \"asdf\" != \"boo\" && -a filename ]]" -> (KEYWORD_TEST (&& (NOT_MATCH_PATTERN (STRING (DOUBLE_QUOTED_STRING asdf)) (STRING (DOUBLE_QUOTED_STRING boo))) (a (STRING filename))))
+"[[ a = b ]]" -> (KEYWORD_TEST (= (STRING a) (STRING b)))
+"[[ a == b ]]" -> (KEYWORD_TEST (MATCH_PATTERN (STRING a) (STRING b)))
 "[[ true ]]" -> (KEYWORD_TEST (STRING true))
 "[[ true && (false || three) ]]" -> (KEYWORD_TEST (&& (STRING true) (|| (STRING false) (STRING three))))
 "[ a = b ]" -> (BUILTIN_TEST (= (STRING a) (STRING b)))