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

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

commit:     b04f9d064a8aec90812df91be179f6bddb7f8174
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 09:04:34 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 07:52:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b04f9d06

Parser: split token compositions

'<=' will generate one token so that some expressions cannot be fully
parsed. Now '>=' and '<=' are split to parse these expressions.

---
 bashast/bashast.g      |    8 ++++----
 scripts/test_expr.bash |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 8486619..7dc9ad5 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -121,6 +121,8 @@ tokens{
 	AND_ASSIGN;
 	XOR_ASSIGN;
 	OR_ASSIGN;
+	LEQ;
+	GEQ;
 
 	NOT_EQUALS;
 	EQUALS_TO;
@@ -991,8 +993,8 @@ shifts
 compare
 	:	shifts (compare_operator^ BLANK!? shifts)?;
 compare_operator
-	:	LEQ
-	|	GEQ
+	:	LESS_THAN EQUALS -> LEQ
+	|	GREATER_THAN EQUALS -> GEQ
 	|	LESS_THAN
 	|	GREATER_THAN
 	|	EQUALS EQUALS -> EQUALS_TO
@@ -1048,8 +1050,6 @@ MINUS	:	'-';
 PLUS	:	'+';
 EXP		:	'**';
 AMP		:	'&';
-LEQ		:	'<=';
-GEQ		:	'>=';
 CARET	:	'^';
 LESS_THAN	:	'<';
 GREATER_THAN	:	'>';

diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash
index 04b5a62..66ab24a 100644
--- a/scripts/test_expr.bash
+++ b/scripts/test_expr.bash
@@ -52,3 +52,5 @@ unset i
 [[ "setup.py" =~ ^(setup\.p|nosetests|py\.test|trial(\ .*)?)$ ]] && echo false
 [ abc = bcd -o abc = abc ] && echo true18
 [ abc = bcd -a abc = abc ] || echo true19
+[[ =a <=b ]]
+[[ =a >=b ]]