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

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

commit:     1406a7f53e34f78f29b14a0af85872a37d37b341
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 13:29:45 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 16:01:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=1406a7f5

Support non-quoted string and expansions in variable definition

Non-quoted variable reference, number, string and arithmetic
expansion are allowed in variable definition.

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

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index ac8a040..a25c58c 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -56,13 +56,14 @@ options{ k=1; }:
 	|NUMBER { $libbash_value = walker->get_string($NUMBER); };
 
 var_def:
-	^(EQUALS libbash_name=name libbash_value=string_expr){
+	^(EQUALS libbash_name=name libbash_value=word){
 		walker->define(libbash_name, libbash_value);
 	};
 
 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; }
 	));
 

diff --git a/scripts/var_expansion.ebuild b/scripts/var_expansion.ebuild
index 62e95c3..533e7a7 100644
--- a/scripts/var_expansion.ebuild
+++ b/scripts/var_expansion.ebuild
@@ -2,3 +2,6 @@ EAPI="3"
 EAPI4="$(($EAPI+1))"
 FOO="${EAPI:-hello}"
 FOO2="${EAPI3:-hello}"
+FOO3=123
+FOO4=$EAPI
+FOO5=$(( 1+1 ))

diff --git a/scripts/var_expansion.ebuild.result b/scripts/var_expansion.ebuild.result
index f92abe4..bad2cf3 100644
--- a/scripts/var_expansion.ebuild.result
+++ b/scripts/var_expansion.ebuild.result
@@ -2,3 +2,6 @@ EAPI=3
 EAPI4=4
 FOO=3
 FOO2=hello
+FOO3=123
+FOO4=3
+FOO5=2