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

[Petteri Räty]

commit:     b680da3520a8fa589848a9c205b52688f3ca13e3
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Apr 16 18:11:54 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:57:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b680da35

Parser: function name rules from bash sources

Relax the function name rules so that now again most eclasses parse. The
implemention is done using negation so hopefully it doesn't break that
easily.

---
 bashast/bashast.g            |    7 +++++--
 bashast/gunit/function.gunit |    8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 3b1e4ed..745b1ff 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -523,9 +523,12 @@ process_substitution
 function:	FUNCTION BLANK+ function_name (BLANK* parens)? wspace compound_command redirect* -> ^(FUNCTION ^(STRING function_name) compound_command redirect*)
 	|	function_name BLANK* parens wspace compound_command redirect* -> ^(FUNCTION["function"] ^(STRING function_name) compound_command redirect*);
 //http://article.gmane.org/gmane.comp.shells.bash.bugs/16424
-//the documented set is stricter but we need to have at least what's used in Gentoo
+//the rules from bash 3.2 general.c:
+//Make sure that WORD is a valid shell identifier, i.e.
+//does not contain a dollar sign, nor is quoted in any way.  Nor
+//does it consist of all digits.
 function_name
-	:	(MINUS|DIGIT|name)+;
+	:	(NUMBER|DIGIT)? ~(DOLLAR|SQUOTE|DQUOTE|LPAREN|RPAREN|BLANK|EOL|NUMBER|DIGIT) ~(DOLLAR|SQUOTE|DQUOTE|LPAREN|RPAREN|BLANK|EOL)*;
 parens	:	LPAREN BLANK* RPAREN;
 name	:	NAME
 	|	LETTER

diff --git a/bashast/gunit/function.gunit b/bashast/gunit/function.gunit
index c22821a..a474273 100644
--- a/bashast/gunit/function.gunit
+++ b/bashast/gunit/function.gunit
@@ -37,3 +37,11 @@ function:
 "function help { echo hi; } 2> /dev/null" -> (function (STRING help) (CURRENT_SHELL (LIST (COMMAND (STRING echo) (STRING hi)))) (REDIR 2 > (STRING / dev / null)))
 "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_name:
+"xemacs-packages_src_unpack" OK
+"while" OK
+"aa'bb" FAIL
+"a\"" FAIL
+"333" FAIL
+"aa$aa" FAIL