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

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

commit:     1434467973035473d51ad3f8c0955e363fc0df17
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 08:19:29 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat May 28 12:10:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=14344679

Walker: support command substitution in double quoted string

---
 bashast/libbashWalker.g               |    3 +++
 scripts/command_execution.bash        |    2 ++
 scripts/command_execution.bash.result |    2 ++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 67886a0..d5522fc 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -320,6 +320,9 @@ double_quoted_string returns[std::string libbash_value]
 	|(ARITHMETIC_EXPRESSION) => ^(ARITHMETIC_EXPRESSION value=arithmetics) {
 		$libbash_value = boost::lexical_cast<std::string>(value);
 	}
+	|libbash_string=command_substitution {
+		$libbash_value = libbash_string;
+	}
 	|libbash_string=any_string { $libbash_value = libbash_string; };
 
 any_string returns[std::string libbash_value]

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index b9b1c82..95401b4 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -44,3 +44,5 @@ declare -F unset_outer
 unset -f unset_outer
 declare -F unset_outer
 echo '$FOO006 "abc" $(( 1 + 2 )) $(echo hi) ...'
+echo "abc $(echo def) ghi"
+FOO008="abc $(echo def) ghi"

diff --git a/scripts/command_execution.bash.result b/scripts/command_execution.bash.result
index d7642f5..d47650d 100644
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@ -14,9 +14,11 @@ FOO006=0 in global
 FOO006= in global
 unset_outer
 $FOO006 "abc" $(( 1 + 2 )) $(echo hi) ...
+abc def ghi
 DEFAULTED=yes
 FOO001=hello
 FOO002=Hello World
 FOO003=1
 FOO004=abc
 FOO005=1 2 3
+FOO008=abc def ghi