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

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

commit:     a41e198778614972aa021d58c1539d6a8cdda8c5
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr 15 15:18:46 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:44:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=a41e1987

Parser: parameter replacements expansions take ;

You can now produce patterns like ${foo%; }. With this change we are able
to parse versionator.eclass fully.

---
 bashast/bashast.g              |    6 +++---
 bashast/gunit/param_main.gunit |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 46a90c9..036cd3e 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -249,8 +249,8 @@ var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ wor
 	|	BANG^ var_name_for_bang (TIMES|AT)
 	|	BANG var_name_for_bang LSQUARE (op=TIMES|op=AT) RSQUARE -> ^(LIST_EXPAND var_name_for_bang $op)
 	|	BANG var_name_for_bang -> ^(VAR_REF var_name_for_bang)
-	|	var_name (POUND^|POUNDPOUND^) fname
-	|	var_name (PCT^|PCTPCT^) fname
+	|	var_name (POUND^|POUNDPOUND^) parameter_pattern
+	|	var_name (PCT^|PCTPCT^) parameter_pattern
 	|	var_name parameter_replace_operator^ parameter_pattern parameter_replace_string
 	|	var_size_ref
 	|	var_name
@@ -259,7 +259,7 @@ var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ wor
 parameter_pattern
 	:	((~SLASH) => parameter_pattern_part)+ -> ^(STRING parameter_pattern_part+);
 parameter_pattern_part
-	:	fname_part|BLANK;
+	:	fname_part|BLANK|SEMIC;
 parameter_replace_string
 	:	(SLASH fname|SLASH)? -> fname?;
 parameter_replace_operator

diff --git a/bashast/gunit/param_main.gunit b/bashast/gunit/param_main.gunit
index 8a14dec..7394b66 100644
--- a/bashast/gunit/param_main.gunit
+++ b/bashast/gunit/param_main.gunit
@@ -38,6 +38,7 @@ var_ref:
 "${foo##bar}" -> (VAR_REF (## foo (STRING bar)))
 "${foo%bar}" -> (VAR_REF (% foo (STRING bar)))
 "${foo%%bar}" -> (VAR_REF (%% foo (STRING bar)))
+"${foo%; *}" -> (VAR_REF (% foo (STRING ;   *)))
 "${this/is/pattern}"->(VAR_REF (REPLACE_FIRST this (STRING is) (STRING pattern)))
 //Test positional/special parameters
 "$1" -> (VAR_REF 1)