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

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

commit:     9729f542d09b1a370ecd4039a1ae2f77a1d85453
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Wed Apr  6 14:56:30 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 14:56:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=9729f542

Simplify var_expansion with syntactic predicates

---
 bashast/libbashWalker.g |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 71aba2e..52d0109 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -86,10 +86,7 @@ var_name returns[std::string libbash_value]
 }:
 	num|name|TIMES|AT;
 
-var_expansion returns[std::string libbash_value]
-@declarations {
-	bool use_length;
-}:
+var_expansion returns[std::string libbash_value]:
 	^(USE_DEFAULT var_name libbash_word=word) {
 		libbash_value = walker->do_default_expansion($var_name.libbash_value, libbash_word);
 	}
@@ -99,11 +96,11 @@ var_expansion returns[std::string libbash_value]
 	|^(USE_ALTERNATE var_name libbash_word=word) {
 		libbash_value = walker->do_alternate_expansion($var_name.libbash_value, libbash_word);
 	}
-	|^(OFFSET var_name offset=arithmetics { use_length = false; } (length=arithmetics { use_length = true; })?) {
-		if(use_length)
-			libbash_value = walker->do_substring_expansion($var_name.libbash_value, offset, length);
-		else
-			libbash_value = walker->do_substring_expansion($var_name.libbash_value, offset);
+	|(^(OFFSET var_name arithmetics arithmetics)) => ^(OFFSET var_name offset=arithmetics length=arithmetics) {
+		libbash_value = walker->do_substring_expansion($var_name.libbash_value, offset, length);
+	}
+	|^(OFFSET var_name offset=arithmetics) {
+		libbash_value = walker->do_substring_expansion($var_name.libbash_value, offset);
 	}
 	|^(POUND var_name) {
 		libbash_value = boost::lexical_cast<std::string>(walker->get_length($var_name.libbash_value));