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

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

commit:     9bf638ee90ebcfced60a9588228df11cc26813ad
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 10:14:13 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 08:38:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=9bf638ee

Parser: support != in arithmetic expansion

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index f4e43ce..bea3740 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -521,7 +521,13 @@ times_division_modulus
 	:	exponential ((TIMES^|SLASH^|PCT^) BLANK!* exponential)*;
 addsub	:	times_division_modulus ((PLUS^|MINUS^) BLANK!* times_division_modulus)*;
 shifts	:	addsub ((LSHIFT^|RSHIFT^) BLANK!* addsub)*;
-compare	:	shifts ((LEQ^|GEQ^|LESS_THAN^|GREATER_THAN^) BLANK!* shifts)?;
+compare	:	shifts (compare_operator^ BLANK!* shifts)?;
+compare_operator
+	:	LEQ
+	|	GEQ
+	|	LESS_THAN
+	|	GREATER_THAN
+	|	BANG EQUALS -> NOT_EQUALS;
 bitwiseand
 	:	compare (AMP^ BLANK!* compare)*;
 bitwisexor

diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gunit
index b462450..2a440fc 100644
--- a/bashast/gunit/arith_main.gunit
+++ b/bashast/gunit/arith_main.gunit
@@ -80,6 +80,7 @@ shifts:
 compare:
 "17" ->"17"
 "19<20" -> (< 19 20)
+"19!=20" -> (NOT_EQUALS 19 20)
 
 bitwiseand:
 "17" -> "17"