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

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

commit:     e70dd9ef41f969157a7f27630d252d8742d4cbe2
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Tue Apr 19 15:27:26 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=e70dd9ef

Parser: prevent arithmetic assign to numbers

Within arithmetic expressions digits can't be variables so doing
$((3=7)) is not valid. Now we don't allow digits to match variable names
in arithmetic. This also silences warnings.

---
 bashast/bashast.g              |   12 ++++++++----
 bashast/gunit/arith_main.gunit |    1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 1424429..9c32d58 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -287,8 +287,12 @@ parameter_replace_operator
 	|	SLASH -> REPLACE_FIRST;
 //Allowable refences to values
 //either directly or through array
-var_name:	num
-	|	name^ LSQUARE! (AT|TIMES|explicit_arithmetic) RSQUARE!
+var_name
+	:	num
+	|	var_name_no_digit;
+//Inside arithmetic we can't allow digits
+var_name_no_digit
+	:	name^ LSQUARE! (AT|TIMES|explicit_arithmetic) RSQUARE!
 	|	name
 	|	POUND;
 //with bang the array syntax is used for array indexes
@@ -484,7 +488,7 @@ arithmetic_var_ref:
 primary	:	num
 	|	arithmetic_var_ref
 	|	command_sub
-	|	var_name -> ^(VAR_REF var_name)
+	|	var_name_no_digit -> ^(VAR_REF var_name_no_digit)
 	|	LPAREN! (arithmetics) RPAREN!;
 post_inc_dec
 	:	primary BLANK? PLUS PLUS -> ^(POST_INCR primary)
@@ -521,7 +525,7 @@ arithmetic_assignment_opterator
 	:	EQUALS|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN|OR_ASSIGN;
 
 arithmetic_assignment
-	:	((var_name|arithmetic_var_ref) BLANK!* arithmetic_assignment_opterator^ BLANK!*)? logicor;
+	:	((var_name_no_digit|arithmetic_var_ref) BLANK!* arithmetic_assignment_opterator^ BLANK!*)? logicor;
 process_substitution
 	:	(dir=LESS_THAN|dir=GREATER_THAN)LPAREN clist BLANK* RPAREN -> ^(PROCESS_SUBSTITUTION $dir clist);
 //the biggie: functions

diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gunit
index 0531c49..4490eb3 100644
--- a/bashast/gunit/arith_main.gunit
+++ b/bashast/gunit/arith_main.gunit
@@ -118,6 +118,7 @@ arithmetic_assignment:
 "var &= 5" -> (&= var 5)
 "var ^= 5" -> (^= var 5)
 "var |= 5" -> (|= var 5)
+"3=7" FAIL
 
 arithmetic_condition:
 "5?7:2"->(ARITHMETIC_CONDITION 5 7 2)