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

[Petteri Räty]

commit:     ea40bc721b3926876dcde99289865c5f023ee0e2
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Fri May  6 06:50:49 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri May  6 06:54:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=ea40bc72

Walker: support logical command list

&& and || operators are supported for command list.

---
 bashast/libbashWalker.g               |   11 +++++++++--
 scripts/command_execution.bash        |    5 +++++
 scripts/command_execution.bash.result |    3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 203cd28..064556a 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -310,9 +310,16 @@ argument[std::vector<std::string>& args]
 	};
 
 logic_command_list
+@declarations {
+	bool logic_and;
+}
 	:command
-	|^(LOGICAND command command)
-	|^(LOGICOR command command);
+	|^((LOGICAND { logic_and = true; } | LOGICOR { logic_and = false; }) command {
+		if(logic_and ? !walker->get_status() : walker->get_status())
+			command(ctx);
+		else
+			seek_to_next_tree(ctx);
+	});
 
 command_list: ^(LIST logic_command_list+);
 

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index 0f7cd03..3664356 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -8,3 +8,8 @@ true
 false
 FOO001=$(echo hello)
 FOO002=$(hi)
+true && echo "right"
+false && echo "wrong"
+false || echo "right"
+true || echo "wrong"
+echo "end"

diff --git a/scripts/command_execution.bash.result b/scripts/command_execution.bash.result
index 4330a65..d9f3021 100644
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@ -1,4 +1,7 @@
 Hello World
 hello world
+right
+right
+end
 FOO001=hello
 FOO002=Hello World