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

[Petteri Räty]

commit:     5f561a36bfefb24ad61f2848536317e62328301c
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 08:42:14 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 06:12:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=5f561a36

Parser: support nested function definitions

---
 bashast/bashast.g                |    3 ++-
 bashast/gunit/function.gunit     |    2 ++
 test/verify_error_output_test.sh |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index c560644..88a44cf 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -111,7 +111,7 @@ flcomment
 clist
 	:	list_level_2 -> ^(LIST list_level_2);
 list_level_1
-	:	(function|pipeline) (BLANK!*(LOGICAND^|LOGICOR^)BLANK!* (function|pipeline))*;
+	:	pipeline (BLANK!*(LOGICAND^|LOGICOR^)BLANK!* pipeline)*;
 // ';' '&' and EOL have lower operator precedence than '&&' and '||' so we need level2 here
 list_level_2
 	:	list_level_1 (BLANK!? command_separator (BLANK!? EOL!)* BLANK!? list_level_1)*;
@@ -127,6 +127,7 @@ time_posix
 //The structure of a command in bash
 command
 	:	compound_command
+	|	function
 	|	simple_command;
 //Simple bash commands
 simple_command

diff --git a/bashast/gunit/function.gunit b/bashast/gunit/function.gunit
index 6ee6c68..612ff4a 100644
--- a/bashast/gunit/function.gunit
+++ b/bashast/gunit/function.gunit
@@ -40,6 +40,8 @@ function:
 "function help { echo 3; } 2> /dev/null > output" OK
 "xorg-2_reconf_source() { :; }" -> (function (STRING xorg - 2 _reconf_source) (CURRENT_SHELL (LIST (COMMAND (STRING :)))))
 
+"function out() { function inner() { :; }; }" -> (function (STRING out) (CURRENT_SHELL (LIST (function (STRING inner) (CURRENT_SHELL (LIST (COMMAND (STRING :))))))))
+
 function_name:
 "xemacs-packages_src_unpack" OK
 "while" OK

diff --git a/test/verify_error_output_test.sh b/test/verify_error_output_test.sh
index b3c2eed..e50252f 100755
--- a/test/verify_error_output_test.sh
+++ b/test/verify_error_output_test.sh
@@ -2,4 +2,4 @@
 
 illegal="${srcdir}/scripts/illegal_script.sh"
 output=$(./variable_printer "$illegal" 2>&1)
-[[ $output == "${illegal}(1)  : error 5 : Unexpected token, at offset 3"* ]]
+[[ $output == "${illegal}(1)  : error 3 : 128:1: command : ( compound_command | function | simple_command );, at offset 3"* ]]