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

[Petteri Räty]

commit:     284f2fd1149453021d518b9cb2665103715df409
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 11:19:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 12:08:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=284f2fd1

Fix broken grammar for test ebuilds

Binary arithmetic is broken by some previous commits. Now it's
fixed.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 9f0f80c..0defc93 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -435,7 +435,7 @@ pre_inc_dec
 	|	MINUS MINUS BLANK? primary -> ^(PRE_DECR primary);
 unary	:	post_inc_dec
 	|	pre_inc_dec
-	|	primary
+	|	BLANK!? primary
 	|	PLUS unary -> ^(PLUS_SIGN unary)
 	|	MINUS unary -> ^(MINUS_SIGN unary)
 	|	(TILDE|BANG)^ unary;

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index e0add2a..33c18a6 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -160,10 +160,10 @@ arithmetics returns[int value]
 	|^(VAR_REF libbash_name=name) {
 		$value = walker->resolve<int>(libbash_name);
 	}
-	|^(PRE_INCR libbash_name=name){ $value = walker->pre_incr(libbash_name); }
-	|^(PRE_DECR libbash_name=name){ $value = walker->pre_decr(libbash_name); }
-	|^(POST_INCR libbash_name=name){ $value = walker->post_incr(libbash_name); }
-	|^(POST_DECR libbash_name=name){ $value = walker->post_decr(libbash_name); }
+	|^(PRE_INCR ^(VAR_REF libbash_name=name)){ $value = walker->pre_incr(libbash_name); }
+	|^(PRE_DECR ^(VAR_REF libbash_name=name)){ $value = walker->pre_decr(libbash_name); }
+	|^(POST_INCR ^(VAR_REF libbash_name=name)){ $value = walker->post_incr(libbash_name); }
+	|^(POST_DECR ^(VAR_REF libbash_name=name)){ $value = walker->post_decr(libbash_name); }
 	|^(EQUALS libbash_name=name l=arithmetics) {
 		$value = walker->set_value(libbash_name, l);
 	}