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

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

commit:     b7ca45122d791c6a76edf9104f49aea3737ee516
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 13:24:15 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed May 11 06:45:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b7ca4512

Walker: fix a bug in word rule

Inside the word rule, we used arithmetic rule to do variable
reference. But that requires the variable to be integer. Now it's
fixed by adding a variable reference alternative.

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

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index e328c21..16e4624 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -306,6 +306,7 @@ var_expansion returns[std::string libbash_value]
 word returns[std::string libbash_value]
 	:(num) => libbash_string=num { $libbash_value = libbash_string; }
 	|string_expr { $libbash_value = $string_expr.libbash_value; }
+	|(VAR_REF) => libbash_string=var_ref[false] { $libbash_value = libbash_string; }
 	|value=arithmetics { $libbash_value = boost::lexical_cast<std::string>(value); };
 
 //variable reference

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index b521b77..1bd7943 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -98,6 +98,7 @@ case $target in
         echo "Shouldn't print this"
         ;;
 esac
+target=xyz
 case $target in
     bcd)
         echo "Shouldn't print this"

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
index 69d693d..08ddf31 100644
--- a/scripts/compound_command.bash.result
+++ b/scripts/compound_command.bash.result
@@ -31,4 +31,4 @@ b=2
 file= foo bar 
 foo=ghi
 i=4
-target=123
+target=xyz