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

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

commit:     196605139384079f1629cf02d7a91860878bbdf7
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Apr 16 12:30:56 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:57:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=19660513

Parser: support commas in command arguments

Comma wasn't listed in the big bunch of tokens allowed in argument
strings. Now it's listed there and disallowed for use inside brace
expansion because it limits alternatives there.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 9619d64..468a460 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -160,7 +160,7 @@ range	:	DIGIT DOTDOT^ DIGIT
 	|	LETTER DOTDOT^ LETTER;
 brace_expansion_part
 	:	brace_expansion
-	|	fname
+	|	((~COMMA) => fname_part)+ -> ^(STRING fname_part+)
 	|	var_ref
 	|	command_sub;
 commasep:	brace_expansion_part(COMMA! brace_expansion_part)+;
@@ -371,6 +371,9 @@ str_part
 	:	ns_str_part
 	|	SLASH;
 //Parts of strings, no slashes, no reserved words
+//Using negation leads to code that doesn't compile with the C backend
+//Should be investigated and filed upstream
+//Problematic: ~(CASE|DO|DONE|ELIF|ELSE|ESAC|FI|FOR|FUNCTION|IF|IN|SELECT|THEN|UNTIL|WHILE|TIME)
 ns_str_part
 	:	num
 	|	name
@@ -378,7 +381,8 @@ ns_str_part
 	|OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|TEST_EXPR
 	|TILDE|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN
 	|TIME_POSIX|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN
-	|OR_ASSIGN|CARET|POUND|POUNDPOUND;
+	|OR_ASSIGN|CARET|POUND|POUNDPOUND|COMMA;
+
 //Generic strings/filenames.
 fname	:	(~POUND) => fname_part fname_part* -> ^(STRING fname_part+);
 //A string that is NOT a bash reserved word

diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit
index 126afe8..a5b1f7f 100644
--- a/bashast/gunit/fname.gunit
+++ b/bashast/gunit/fname.gunit
@@ -66,3 +66,4 @@ fname:
 "ab[[.backslash.]]" -> (STRING ab (MATCH_PATTERN (COLLATING_SYMBOL backslash)))
 "ab[12[:alpha:]]" -> (STRING ab (MATCH_PATTERN 12 (CHARACTER_CLASS alpha)))
 "\"'foo'\"" -> (STRING (DOUBLE_QUOTED_STRING ' foo '))
+"--preserve=timestamps,mode" -> (STRING - -p reserve = timestamps , mode)