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

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

commit:     a46ef6a3de34ee796cd3274079e6e5b91fd99cfc
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 09:14:22 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 13:44:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=a46ef6a3

Walker: support multiple atoms of string_expr

Expression like "${PN}-${PV}" will be parsed as var_ref, '-',
var_ref. Multiple atoms could not be handled by previous walker
grammar but now it's fixed.

---
 bashast/libbashWalker.g       |   17 +++++++++--------
 scripts/var_def.ebuild        |    3 +++
 scripts/var_def.ebuild.result |    3 +++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 182f6c3..b6c9a7f 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -132,18 +132,19 @@ var_def
 	};
 
 string_expr returns[std::string libbash_value, bool quoted]
-	:^(STRING(
+@init {
+	$quoted = true;
+}
+	:^(STRING (
 		(DOUBLE_QUOTED_STRING) =>
-			^(DOUBLE_QUOTED_STRING (libbash_string=double_quoted_string { $libbash_value += libbash_string; })*) {
-				$quoted = true;
-			}
+			^(DOUBLE_QUOTED_STRING (libbash_string=double_quoted_string { $libbash_value += libbash_string; })*)
 		|(ARITHMETIC_EXPRESSION) =>
 			^(ARITHMETIC_EXPRESSION value=arithmetics {
-				$libbash_value = boost::lexical_cast<std::string>(value); $quoted = false;
+				$libbash_value += boost::lexical_cast<std::string>(value); $quoted = false;
 			})
-		|(var_ref[false]) => libbash_string=var_ref[false] { $libbash_value = libbash_string; $quoted = false; }
-		|(libbash_string=any_string { $libbash_value += libbash_string; $quoted = false; })+
-	));
+		|(var_ref[false]) => libbash_string=var_ref[false] { $libbash_value += libbash_string; $quoted = false; }
+		|(libbash_string=any_string { $libbash_value += libbash_string; $quoted = false; })
+	)+);
 
 //double quoted string rule, allows expansions
 double_quoted_string returns[std::string libbash_value]

diff --git a/scripts/var_def.ebuild b/scripts/var_def.ebuild
index c93a6de..56f8f8d 100644
--- a/scripts/var_def.ebuild
+++ b/scripts/var_def.ebuild
@@ -32,3 +32,6 @@ ARRAY08="${ARRAY05[@]}"
 ARRAY09="${ARRAY05[*]}"
 IFS=";,:"
 ARRAY10="${ARRAY05[*]}"
+FOO001="networkmanager"
+FOO002="0.8.2"
+FOO003=${FOO001}-${FOO002}

diff --git a/scripts/var_def.ebuild.result b/scripts/var_def.ebuild.result
index 058bd98..292b9c7 100644
--- a/scripts/var_def.ebuild.result
+++ b/scripts/var_def.ebuild.result
@@ -15,6 +15,9 @@ DESCRIPTION=SunPinyin is a SLM (Statistical Language Model) based IME
 EAPI=1
 EMPTY=
 EMPTY_ARRAY=
+FOO001=networkmanager
+FOO002=0.8.2
+FOO003=networkmanager-0.8.2
 HOMEPAGE=http://sunpinyin.googlecode.com
 IUSE=
 KEYWORDS=~amd64 ~x86