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

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

commit:     6db1d40390c7b90925085df91e4888b2b5d5f91e
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 02:05:28 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 07:22:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=6db1d403

Support multiple unquoted string tokens

for AST like (STRING ldflags . patch), ". patch" was lost. Now the
AST can be handled correctly.

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

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 825987a..06ff2f8 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -64,7 +64,7 @@ string_expr	returns[std::string libbash_value]:
 	^(STRING(
 		(DOUBLE_QUOTED_STRING) => ^(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); })
-		|libbash_string=any_string { $libbash_value = libbash_string; }
+		|(libbash_string=any_string { $libbash_value += libbash_string; })+
 	));
 
 //double quoted string rule, allows expansions

diff --git a/scripts/var_def.ebuild b/scripts/var_def.ebuild
index 73f94b1..acb132b 100644
--- a/scripts/var_def.ebuild
+++ b/scripts/var_def.ebuild
@@ -10,3 +10,4 @@ IUSE=""
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
+MY_PATCH=ldflags.patch

diff --git a/scripts/var_def.ebuild.result b/scripts/var_def.ebuild.result
index 671ae4c..71872a4 100644
--- a/scripts/var_def.ebuild.result
+++ b/scripts/var_def.ebuild.result
@@ -6,6 +6,7 @@ HOMEPAGE=http://sunpinyin.googlecode.com
 IUSE=
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 CDDL
+MY_PATCH=ldflags.patch
 RDEPEND=dev-db/sqlite:3
 SLOT=0
 SRC_URI=http://open-gram.googlecode.com/files/dict.utf8.tar.bz2