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

[Petteri Räty]

commit:     41079afae26d6203928c8647de87c63e28aeb6c3
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 12:40:59 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat May  7 07:01:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=41079afa

Parser: support defining local variables

---
 bashast/bashast.g                |    5 +++--
 bashast/gunit/simp_command.gunit |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 3a84d29..51fe9a9 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -130,7 +130,7 @@ simple_command
 	|	variable_definitions -> ^(VARIABLE_DEFINITIONS variable_definitions)
 	|	bash_command^ redirect*;
 variable_definitions
-	:	var_def (BLANK!+ var_def)*;
+	:	(LOCAL BLANK!+)? var_def (BLANK!+ var_def)*;
 bash_command
 	:	fname_no_res_word (BLANK+ fname)* -> ^(COMMAND fname_no_res_word fname*);
 redirect:	BLANK!* here_string_op^ BLANK!* fname
@@ -388,7 +388,7 @@ options{k=1;backtrack=false;}
 	:	DIGIT|NUMBER;
 //A rule for filenames/strings
 res_word_str
-	:	CASE|DO|DONE|ELIF|ELSE|ESAC|FI|FOR|FUNCTION|IF|IN|SELECT|THEN|UNTIL|WHILE|TIME;
+	:	CASE|DO|DONE|ELIF|ELSE|ESAC|FI|FOR|FUNCTION|IF|IN|SELECT|THEN|UNTIL|WHILE|TIME|LOCAL;
 //Any allowable part of a string, including slashes, no pounds
 str_part
 	:	ns_str_part
@@ -653,6 +653,7 @@ COLON	:	':';
 QMARK	:	'?';
 //Operators for conditional statements
 TEST_EXPR	:	'test';
+LOCAL	:	'local';
 LOGICAND :	'&&';
 LOGICOR	:	'||';
 //Tokens for strings

diff --git a/bashast/gunit/simp_command.gunit b/bashast/gunit/simp_command.gunit
index b2dc74a..0ec100f 100644
--- a/bashast/gunit/simp_command.gunit
+++ b/bashast/gunit/simp_command.gunit
@@ -29,3 +29,4 @@ simple_command:
 "./foobär" -> (COMMAND (STRING . / foob ä r))
 "cat ~/Documents/todo.txt" -> (COMMAND (STRING cat) (STRING ~ / Documents / todo . txt))
 "dodir ${foo}/${bar}" -> (COMMAND (STRING dodir) (STRING (VAR_REF foo) / (VAR_REF bar)))
+"local a=123 b=(1 2 3)" -> (VARIABLE_DEFINITIONS local (= a (STRING 123)) (= b (ARRAY (STRING 1) (STRING 2) (STRING 3))))