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

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

commit:     ba6972dbe97c47614f4aeef8187ae15e08b57ee2
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 09:55:48 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 11:53:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=ba6972db

Walker: support shortcut capability for logic or

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

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index fda4ef6..99d7f53 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -71,7 +71,7 @@ options
 			index = value;
 		}
 
-		// seek to LT(2) and consume
+		// skip to next tree
 		void seek_to_next_tree(plibbashWalker ctx)
 		{
 			// Current depth of the tree we are traversing
@@ -95,6 +95,14 @@ options
 			CONSUME();
 		}
 
+		void skip_next_token_or_tree(plibbashWalker ctx)
+		{
+			if(LA(2) != DOWN)
+				SEEK(INDEX() + 1);
+			else
+				seek_to_next_tree(ctx);
+		}
+
 		// The method is used to append a pattern with another one. Because it's not allowed to append an empty pattern,
 		// we need the argument 'do_append' to indicate whether the pattern is empty. 'do_append' will be set to true after
 		// the first assignment.
@@ -953,7 +961,17 @@ primary returns[std::string libbash_value, unsigned index]
 
 // shell arithmetic
 arithmetics returns[int value]
-	:^(LOGICOR l=arithmetics r=arithmetics) { $value = l || r; }
+	:^(LOGICOR l=arithmetics {
+		if(l)
+		{
+			skip_next_token_or_tree(ctx);
+			$value = 1;
+		}
+		else
+		{
+			$value = (arithmetics(ctx) != 0);
+		}
+	})
 	|^(LOGICAND l=arithmetics r=arithmetics) { $value = l && r; }
 	|^(PIPE l=arithmetics r=arithmetics) { $value = l | r; }
 	|^(CARET l=arithmetics r=arithmetics) { $value = l ^ r; }

diff --git a/scripts/binary_arithmetic.bash b/scripts/binary_arithmetic.bash
index 330d07b..114655a 100644
--- a/scripts/binary_arithmetic.bash
+++ b/scripts/binary_arithmetic.bash
@@ -63,3 +63,4 @@ FOO057="$((${FOO056}++))"
 FOO058="$((${FOO056}+=10))"
 ARRAY=(1 2 3 4 5)
 FOO059="$((100**0))"
+FOO060="$((FOO059||FOO059++))"

diff --git a/scripts/binary_arithmetic.bash.result b/scripts/binary_arithmetic.bash.result
index de065d6..740548d 100644
--- a/scripts/binary_arithmetic.bash.result
+++ b/scripts/binary_arithmetic.bash.result
@@ -58,5 +58,6 @@ FOO056=value
 FOO057=100
 FOO058=111
 FOO059=1
+FOO060=1
 PARTIAL=5
 value=111