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

[Petteri Räty]

commit:     0dfd3c9fc0901c078f064f7f738f6974dcabc4c1
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 10:49:47 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 10:49:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=0dfd3c9f

Implement variable reference

Double quoted string can use variable reference now.

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

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index c0c8395..fd736c8 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -62,9 +62,7 @@ var_def:
 
 string_expr	returns[std::string libbash_value]:
 	^(STRING libbash_string=string_expr) { $libbash_value = libbash_string; }
-	|^(DOUBLE_QUOTED_STRING (dq_str_part { libbash_string += $dq_str_part.libbash_value; })*) {
-		$libbash_value = libbash_string;
-	};
+	|^(DOUBLE_QUOTED_STRING (libbash_string=dqstr { $libbash_value += libbash_string; })*);
 
 //A rule for filenames/strings
 res_word_str returns[std::string libbash_value]
@@ -105,6 +103,14 @@ dq_str_part returns[std::string libbash_value]
 }:
 	BLANK|EOL|AMP|LOGICAND|LOGICOR|LESS_THAN|GREATER_THAN|PIPE|SQUOTE|SEMIC|COMMA|LPAREN|RPAREN|LLPAREN|RRPAREN|DOUBLE_SEMIC|LBRACE|RBRACE|TICK|LEQ|GEQ|str_part_with_pound;
 
+//double quoted string rule, allows expansions
+dqstr returns[std::string libbash_value]:
+	dq_str_part { $libbash_value = $dq_str_part.libbash_value; }
+	| libbash_string=var_ref { $libbash_value = libbash_string; };
+
+//variable reference
+var_ref returns[std::string libbash_value]:
+	^(VAR_REF libbash_name=name) { $libbash_value=walker->resolve<std::string>(libbash_name); };
 
 // shell arithmetic
 arithmetics returns[int value]

diff --git a/scripts/var_def.ebuild b/scripts/var_def.ebuild
index b5f9a14..73f94b1 100644
--- a/scripts/var_def.ebuild
+++ b/scripts/var_def.ebuild
@@ -8,3 +8,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"

diff --git a/scripts/var_def.ebuild.result b/scripts/var_def.ebuild.result
index 750f11b..671ae4c 100644
--- a/scripts/var_def.ebuild.result
+++ b/scripts/var_def.ebuild.result
@@ -1,3 +1,5 @@
+DEPEND=dev-db/sqlite:3
+		dev-util/pkgconfig
 DESCRIPTION=SunPinyin is a SLM (Statistical Language Model) based IME
 EAPI=1
 HOMEPAGE=http://sunpinyin.googlecode.com