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

[Petteri Räty]

commit:     d708238429d2687e5362d19e25b5e0bfc6f3eb06
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 14:52:45 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 14:58:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=d7082384

Parser: support == and != in test built-in

Virtual token is used instead of OP['..'] because the previous one
can't be handled by tree grammar.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 9fcacc0..b079d07 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -94,6 +94,8 @@ tokens{
 	// Avoid ambiguity (being a sign or an operator)
 	PLUS_SIGN;
 	MINUS_SIGN;
+	// Operators
+	NOT_EQUALS;
 }
 
 start	:	(flcomment)? EOL* clist BLANK* (SEMIC|AMP|EOL)? -> clist;
@@ -335,7 +337,7 @@ builtin_cond_primary
 	|	builtin_cond_unary
 	|	fname;
 builtin_cond_binary
-	:	cond_part BLANK!* binary_string_op_builtin^ BLANK!? cond_part;
+	:	cond_part BLANK!* binary_string_op_builtin^ BLANK!* cond_part;
 builtin_cond_unary
 	:	uop^ BLANK!+ cond_part;
 keyword_cond
@@ -355,8 +357,9 @@ binary_str_op_keyword
 	|	GREATER_THAN;
 binary_string_op_builtin
 	:	bop
+	|	EQUALS EQUALS -> EQUALS
 	|	EQUALS
-	|	BANG EQUALS -> OP["!="]
+	|	BANG EQUALS -> NOT_EQUALS
 	|	ESC_LT
 	|	ESC_GT;
 bop	:	MINUS! NAME^;

diff --git a/bashast/gunit/cond_main.gunit b/bashast/gunit/cond_main.gunit
index 159c734..78ebbf9 100644
--- a/bashast/gunit/cond_main.gunit
+++ b/bashast/gunit/cond_main.gunit
@@ -25,3 +25,6 @@ cond_expr:
 "[[ \"asdf\" != \"boo\" && -a filename ]]" -> (KEYWORD_TEST (&& (!= (STRING (DOUBLE_QUOTED_STRING asdf)) (STRING (DOUBLE_QUOTED_STRING boo))) (a (STRING filename))))
 "[[ true ]]" -> (KEYWORD_TEST (STRING true))
 "[[ true && (false || three) ]]" -> (KEYWORD_TEST (&& (STRING true) (|| (STRING false) (STRING three))))
+"[ a = b ]" -> (BUILTIN_TEST (= (STRING a) (STRING b)))
+"[ a == b ]" -> (BUILTIN_TEST (= (STRING a) (STRING b)))
+"[ a != b ]" -> (BUILTIN_TEST (NOT_EQUALS (STRING a) (STRING b)))