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

[Petteri Räty]

commit:     0827ad788f2799814598c6b013abc2a5da76c703
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr 15 14:27:07 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:44:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=0827ad78

Parser: blanks in parameter replace pattern

We now support replacements like ${foo// }. The white space handling in
this area is still insufficient after this change but it gets us
further along in parsing versionator.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 67353e3..a7d150c 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -253,7 +253,9 @@ var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ wor
 	|	TIMES
 	|	AT;
 parameter_pattern
-	:	((~SLASH) => fname_part)+ -> ^(STRING fname_part+);
+	:	((~SLASH) => parameter_pattern_part)+ -> ^(STRING parameter_pattern_part+);
+parameter_pattern_part
+	:	fname_part|BLANK;
 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 0d9bd78..8a14dec 100644
--- a/bashast/gunit/param_main.gunit
+++ b/bashast/gunit/param_main.gunit
@@ -52,6 +52,7 @@ var_ref:
 "$_" -> (VAR_REF _)
 "${_}" -> (VAR_REF _)
 "${PV//./_}" -> (VAR_REF (REPLACE_ALL PV (STRING .) (STRING _)))
+"${PV// }" -> (VAR_REF (REPLACE_ALL PV (STRING  )))
 "${PV//[-._]/}" -> (VAR_REF (REPLACE_ALL PV (STRING (MATCH_PATTERN - . _))))
 "${PV/${pattern}/${replace}}" -> (VAR_REF (REPLACE_FIRST PV (STRING (VAR_REF pattern)) (STRING (VAR_REF replace))))
 "${PV/#foo/bar}" -> (VAR_REF (REPLACE_AT_START PV (STRING foo) (STRING bar)))