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

[Petteri Räty]

commit:     67ae08a05b489c31f9df7453eea3ed8446d4f5ae
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 10:47:40 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 14:58:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=67ae08a0

Walker: support until loop

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

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 01c080e..8dc0b41 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -406,8 +406,9 @@ for_modification
 while_expr
 @declarations {
 	ANTLR3_MARKER command_index;
+	bool negate;
 }
-	:^(WHILE {
+	:^((WHILE { negate = false; } | UNTIL { negate = true; }) {
 		// omit the first DOWN token
 		SEEK(INDEX() + 1);
 
@@ -415,7 +416,7 @@ while_expr
 		while(true)
 		{
 			command_list(ctx);
-			if(walker->get_status())
+			if(walker->get_status() == (negate? 0 : 1))
 				break;
 			command_list(ctx);
 			SEEK(command_index);

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index 9da53b8..ad00e63 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -34,3 +34,15 @@ while [ $i \< 0 ]
 do
     echo "Shouldn't print this"
 done
+
+i=0;
+until [ $i == 4 ]
+do
+    i=$(( i + 1 ))
+    echo $i
+done
+
+until [ $i \> 0 ]
+do
+    echo "Shouldn't print this"
+done

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
index b2d305a..3e2e9f4 100644
--- a/scripts/compound_command.bash.result
+++ b/scripts/compound_command.bash.result
@@ -15,6 +15,10 @@ ghi
 2
 3
 4
+1
+2
+3
+4
 file= foo bar 
 foo=ghi
 i=4