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

[Petteri Räty]

commit:     c3356056896f2fab67e11cf4b4165487b6832211
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 15:59:20 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun May 29 11:44:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=c3356056

Walker: use any_string for function name

The name rule doesn't cover all the possible characters in function
names. As we've already validated the function name in parser grammar,
the any_string rule is sufficient to match the function name.

---
 bashast/libbashWalker.g   |    8 ++++++--
 scripts/function_def.bash |    8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 5c8c371..e61d7b6 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -826,9 +826,13 @@ command_substitution returns[std::string libbash_value]
 	};
 
 function_definition returns[int placeholder]
-	:^(FUNCTION ^(STRING name) {
+@declarations {
+	std::string function_name;
+}
+	// We've already validated the function name in parser grammar so here we just use any_string to match the name.
+	:^(FUNCTION ^(STRING (libbash_string=any_string { function_name += libbash_string; })+) {
 		// Define the function with current index
-		walker->define_function($name.libbash_value, INDEX());
+		walker->define_function(function_name, INDEX());
 		// Skip the AST for function body
 		seek_to_next_tree(ctx);
 	});

diff --git a/scripts/function_def.bash b/scripts/function_def.bash
index 54030e7..53e5ec8 100644
--- a/scripts/function_def.bash
+++ b/scripts/function_def.bash
@@ -27,20 +27,20 @@ ARRAY=(1 2 3)
 func_with_args ${ARRAY[@]} $FOO001
 func_with_args 100 $ARG2 $ARG3 $ARG4
 
-func_with_return()
+func-with-return()
 {
     return 1
     NOT_EXIST=1
 }
-func_with_return
+func-with-return
 RETURN_STATUS=$?
-func_with_return2()
+func_with-return2()
 {
     true
     return
     NOT_EXIST=1
 }
-func_with_return2
+func_with-return2
 RETURN_STATUS2=$?
 
 func_nested1() {