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

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

commit:     9953ba4f79f12dacc0090c36adda3e7237148e50
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sun Apr 10 17:03:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 06:45:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=9953ba4f

Improve explicit arithmetic expression places

In array indexes and parameter offset expansion you can use the longer
form of arithmetic expansion like foo[$((1))]=bar

---
 bashast/bashast.g               |    9 ++++++---
 bashast/gunit/assoc_array.gunit |    1 +
 bashast/gunit/param_main.gunit  |    1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 0a42b4e..a9ded45 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -215,7 +215,7 @@ cond_comparison
 //Variables
 //Defining a variable
 var_def
-	:	name LSQUARE BLANK? arithmetics BLANK* RSQUARE EQUALS value -> ^(EQUALS ^(name arithmetics) value)
+	:	name LSQUARE BLANK? explicit_arithmetic BLANK* RSQUARE EQUALS value -> ^(EQUALS ^(name explicit_arithmetic) value)
 	|	name EQUALS^ value
 	|	LET! name EQUALS^ arithmetic;
 //Possible values of a variable
@@ -226,7 +226,7 @@ value	:	num
 //allow the parser to create array variables
 arr_val	:
 	|	(ag+=val wspace?)+ -> ^(ARRAY $ag+);
-val	:	LSQUARE! BLANK!* arithmetics BLANK!? RSQUARE! EQUALS^ pos_val
+val	:	LSQUARE! BLANK!* explicit_arithmetic BLANK!? RSQUARE! EQUALS^ pos_val
 	|	pos_val;
 pos_val	: command_sub
 	|	var_ref
@@ -245,7 +245,7 @@ var_ref
 	|	DOLLAR BANG -> ^(VAR_REF BANG);
 //Variable expansions
 var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ word
-	|	var_name COLON wspace* LPAREN? os=arithmetic RPAREN? (COLON len=arithmetic)? -> ^(OFFSET var_name $os ^($len)?)
+	|	var_name COLON wspace* LPAREN? os=explicit_arithmetic RPAREN? (COLON len=explicit_arithmetic)? -> ^(OFFSET var_name $os ^($len)?)
 	|	BANG^ var_name (TIMES|AT)
 	|	BANG var_name LSQUARE (op=TIMES|op=AT) RSQUARE -> ^(LIST_EXPAND var_name $op)
 	|	BANG var_name -> ^(VAR_REF var_name)
@@ -422,6 +422,9 @@ extended_pattern_match
 //Arithmetic expansion
 arithmetic_expansion
 	:	DOLLAR LLPAREN BLANK* arithmetics BLANK* RRPAREN -> ^(ARITHMETIC_EXPRESSION arithmetics);
+//explicit arithmetic in places like array indexes
+explicit_arithmetic
+	:	(DOLLAR LLPAREN BLANK*)? arithmetics (BLANK* RRPAREN)? -> arithmetics;
 //The comma operator for arithmetic expansions
 arithmetics
 	:	arithmetic (BLANK!* COMMA! BLANK!* arithmetic)*;

diff --git a/bashast/gunit/assoc_array.gunit b/bashast/gunit/assoc_array.gunit
index cdc7b0c..c8043af 100644
--- a/bashast/gunit/assoc_array.gunit
+++ b/bashast/gunit/assoc_array.gunit
@@ -24,3 +24,4 @@ var_def:
 "asdf[$idx]=${var}" -> (= (asdf (VAR_REF idx)) (VAR_REF var))
 "asdf[++i]=${var}" -> (= (asdf (PRE_INCR (VAR_REF i))) (VAR_REF var))
 "asdf[++i,j]=${var}" -> (= (asdf (PRE_INCR (VAR_REF i)) (VAR_REF j)) (VAR_REF var))
+"asdf[$((i))]=${var}" -> (= (asdf (VAR_REF i)) (VAR_REF var))

diff --git a/bashast/gunit/param_main.gunit b/bashast/gunit/param_main.gunit
index c6194de..4aee6d2 100644
--- a/bashast/gunit/param_main.gunit
+++ b/bashast/gunit/param_main.gunit
@@ -26,6 +26,7 @@ var_ref:
 "${bar: -10}" -> (VAR_REF (OFFSET bar (MINUS_SIGN 10)))
 "${bar:(-10 + 5)}" -> (VAR_REF (OFFSET bar (+ (MINUS_SIGN 10) 5)))
 "${foo:5:2}" -> (VAR_REF (OFFSET foo 5 2))
+"${foo:$((5)):$((2))}" -> (VAR_REF (OFFSET foo 5 2))
 "${!asdf*}" -> (VAR_REF (! asdf *))
 "${!asdf@}" -> (VAR_REF (! asdf @))
 "${!asdf[*]}" -> (VAR_REF (LIST_EXPAND asdf *))