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

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

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

Parser: reorder arithmetic rules

Reorder arithmetic expansion related rules so that they flow logically
from top to bottom. Previously some first rules came at the top and then
it jumped to the bottom of the recursion.

---
 bashast/bashast.g |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 6612dbc..d789acd 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -466,22 +466,6 @@ extended_pattern_match
 	|	PLUS LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_AT_LEAST_ONE fname+)
 	|	AT LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_EXACTLY_ONE fname+)
 	|	BANG LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_NONE fname+);
-//Arithmetic expansion
-//the square bracket from is deprecated
-//http://permalink.gmane.org/gmane.comp.shells.bash.bugs/14479
-arithmetic_expansion
-	:	DOLLAR LLPAREN BLANK* arithmetics RRPAREN -> ^(ARITHMETIC_EXPRESSION arithmetics)
-	|	DOLLAR LSQUARE BLANK* arithmetics RSQUARE -> ^(ARITHMETIC_EXPRESSION arithmetics);
-//explicit arithmetic in places like array indexes
-explicit_arithmetic
-	:	(DOLLAR LLPAREN BLANK*)? arithmetics RRPAREN? -> arithmetics
-	|	(DOLLAR LSQUARE BLANK*)? arithmetics RSQUARE? -> arithmetics;
-//The comma operator for arithmetic expansions
-arithmetics
-	:	arithmetic (COMMA! BLANK!* arithmetic)*;
-arithmetic
-	:	arithmetic_condition
-	|	arithmetic_assignment;
 //The base of the arithmetic operator.  Used for order of operations
 arithmetic_var_ref:
 	var_ref -> ^(VAR_REF var_ref);
@@ -526,6 +510,23 @@ arithmetic_assignment_opterator
 
 arithmetic_assignment
 	:	((var_name_no_digit|arithmetic_var_ref) BLANK!* arithmetic_assignment_opterator^ BLANK!*)? logicor;
+arithmetic
+	:	arithmetic_condition
+	|	arithmetic_assignment;
+//The comma operator for arithmetic expansions
+arithmetics
+	:	arithmetic (COMMA! BLANK!* arithmetic)*;
+//explicit arithmetic in places like array indexes
+explicit_arithmetic
+	:	(DOLLAR LLPAREN BLANK*)? arithmetics RRPAREN? -> arithmetics
+	|	(DOLLAR LSQUARE BLANK*)? arithmetics RSQUARE? -> arithmetics;
+//Arithmetic expansion
+//the square bracket from is deprecated
+//http://permalink.gmane.org/gmane.comp.shells.bash.bugs/14479
+arithmetic_expansion
+	:	DOLLAR LLPAREN BLANK* arithmetics RRPAREN -> ^(ARITHMETIC_EXPRESSION arithmetics)
+	|	DOLLAR LSQUARE BLANK* arithmetics RSQUARE -> ^(ARITHMETIC_EXPRESSION arithmetics);
+
 process_substitution
 	:	(dir=LESS_THAN|dir=GREATER_THAN)LPAREN clist BLANK* RPAREN -> ^(PROCESS_SUBSTITUTION $dir clist);
 //the biggie: functions