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

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

commit:     a316f3d632b98ade273420121947c9cc51d6be98
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 07:57:25 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat May 28 08:27:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=a316f3d6

Walker: support single quoted string

Single quoted string is supported in string expression and basic
pattern matching.

---
 bashast/libbashWalker.g               |   17 +++++++++--------
 scripts/command_execution.bash        |    1 +
 scripts/command_execution.bash.result |    1 +
 scripts/var_expansion.bash            |    4 ++++
 scripts/var_expansion.bash.result     |    5 ++++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 378d5e5..67886a0 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -191,6 +191,11 @@ string_part returns[std::string libbash_value, bool quoted]
 									$libbash_value += libbash_string;
 									$quoted = true;
 								})*)
+	|(SINGLE_QUOTED_STRING) =>
+		^(SINGLE_QUOTED_STRING (libbash_string=any_string {
+									$libbash_value += libbash_string;
+									$quoted = true;
+								})*)
 	|(ARITHMETIC_EXPRESSION) =>
 		^(ARITHMETIC_EXPRESSION value=arithmetics {
 			$libbash_value = boost::lexical_cast<std::string>(value);
@@ -276,11 +281,7 @@ basic_pattern[boost::xpressive::sregex& pattern, bool greedy, bool& do_append]
 	bool negation;
 	std::string pattern_str;
 }
-	:(DOUBLE_QUOTED_STRING) =>
-		^(DOUBLE_QUOTED_STRING (libbash_string=double_quoted_string {
-			append($pattern, as_xpr(libbash_string), do_append);
-		})*)
-	|(MATCH_ALL) => MATCH_ALL {
+	:(MATCH_ALL) => MATCH_ALL {
 		if($greedy)
 			append($pattern, *_, do_append);
 		else
@@ -309,9 +310,9 @@ basic_pattern[boost::xpressive::sregex& pattern, bool greedy, bool& do_append]
 
 		append($pattern, sregex::compile(pattern_str), do_append);
 	}
-	|(libbash_string=any_string {
-		append($pattern, as_xpr(libbash_string), do_append);
-	});
+	|string_part {
+		append($pattern, as_xpr($string_part.libbash_value), do_append);
+	};
 
 //double quoted string rule, allows expansions
 double_quoted_string returns[std::string libbash_value]

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index b1670f2..b9b1c82 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -43,3 +43,4 @@ echo "FOO006=$FOO006 in global"
 declare -F unset_outer
 unset -f unset_outer
 declare -F unset_outer
+echo '$FOO006 "abc" $(( 1 + 2 )) $(echo hi) ...'

diff --git a/scripts/command_execution.bash.result b/scripts/command_execution.bash.result
index d941a6d..d7642f5 100644
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@ -13,6 +13,7 @@ FOO006= in global
 FOO006=0 in global
 FOO006= in global
 unset_outer
+$FOO006 "abc" $(( 1 + 2 )) $(echo hi) ...
 DEFAULTED=yes
 FOO001=hello
 FOO002=Hello World

diff --git a/scripts/var_expansion.bash b/scripts/var_expansion.bash
index 0a84737..1419686 100644
--- a/scripts/var_expansion.bash
+++ b/scripts/var_expansion.bash
@@ -92,3 +92,7 @@ function positional_parameter_test(){
     FOO088=${*:0}
 }
 positional_parameter_test 1 2 3 4 5
+target="abc*abc"
+echo ${target/*}
+echo ${target/'*'}
+echo ${target/"*"}

diff --git a/scripts/var_expansion.bash.result b/scripts/var_expansion.bash.result
index 5ec7c65..dac4d8e 100644
--- a/scripts/var_expansion.bash.result
+++ b/scripts/var_expansion.bash.result
@@ -1,3 +1,6 @@
+
+abcabc
+abcabc
 ARRAY=hi hello 1 2 3
 ARRAY2=hello
 EAPI=3
@@ -89,4 +92,4 @@ FOO085=1 2
 FOO086=5
 FOO087=4 5
 FOO088=filename 1 2 3 4 5
-target=abc123abc
+target=abc*abc