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

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

commit:     f7ac14b579909831a9064143c5e720bbf341bdfe
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Tue Apr 19 15:16:45 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 11:22:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f7ac14b5

Parser: fix warnings from unary rule

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 0842f54..1424429 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -494,10 +494,10 @@ pre_inc_dec
 	|	MINUS MINUS BLANK? primary -> ^(PRE_DECR primary);
 unary	:	post_inc_dec
 	|	pre_inc_dec
-	|	BLANK!? primary
-	|	PLUS unary -> ^(PLUS_SIGN unary)
-	|	MINUS unary -> ^(MINUS_SIGN unary)
-	|	(TILDE|BANG)^ unary;
+	|	primary
+	|	PLUS BLANK* unary -> ^(PLUS_SIGN unary)
+	|	MINUS BLANK* unary -> ^(MINUS_SIGN unary)
+	|	(TILDE|BANG)^ BLANK!* unary;
 exponential
 	:	unary (BLANK!* EXP^ BLANK!* unary)* ;
 times_division_modulus

diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gunit
index d8697af..0531c49 100644
--- a/bashast/gunit/arith_main.gunit
+++ b/bashast/gunit/arith_main.gunit
@@ -123,6 +123,9 @@ arithmetic_condition:
 "5?7:2"->(ARITHMETIC_CONDITION 5 7 2)
 "(4-3)?0:1"->(ARITHMETIC_CONDITION (- 4 3) 0 1)
 
+arithmetics:
+"~   10" -> (~ 10)
+
 arithmetic_expansion:
 "$((5+4, 3+2, a*b))" -> (ARITHMETIC_EXPRESSION (+ 5 4) (+ 3 2) (* (VAR_REF a) (VAR_REF b)))
 "$[1]" -> (ARITHMETIC_EXPRESSION 1)