From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/
Date: Wed, 27 Apr 2011 15:11:12 +0000 (UTC)	[thread overview]
Message-ID: <67ae08a05b489c31f9df7453eea3ed8446d4f5ae.betelgeuse@gentoo> (raw)
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
next             reply	other threads:[~2011-04-27 15:11 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-27 15:11 Petteri Räty [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-19 15:23 [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/ Petteri Räty
2012-08-19 14:54 Petteri Räty
2012-08-19 14:54 Petteri Räty
2012-08-19 14:29 Petteri Räty
2012-08-07  2:38 Mu Qiao
2012-08-07  2:38 Mu Qiao
2012-08-07  2:38 Mu Qiao
2012-07-29 12:46 Petteri Räty
2012-07-29 12:45 Petteri Räty
2012-07-08  9:44 Petteri Räty
2012-07-08  9:31 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-07-20 13:08 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:05 Petteri Räty
2011-06-25 10:05 Petteri Räty
2011-06-19 19:15 Petteri Räty
2011-06-18  9:55 Petteri Räty
2011-06-16 16:53 Petteri Räty
2011-06-16 16:53 Petteri Räty
2011-06-11  8:52 Petteri Räty
2011-06-11  8:52 Petteri Räty
2011-06-09 11:46 Petteri Räty
2011-06-09  8:15 Petteri Räty
2011-06-09  7:27 Petteri Räty
2011-06-03 12:43 Petteri Räty
2011-06-01 12:19 Petteri Räty
2011-05-29 11:20 Petteri Räty
2011-05-29 11:20 Petteri Räty
2011-05-29 11:20 Petteri Räty
2011-05-28 13:11 Petteri Räty
2011-05-28 13:11 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-23 14:39 Petteri Räty
2011-05-22 21:00 Petteri Räty
2011-05-12 14:06 Petteri Räty
2011-05-12 14:06 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-06 10:29 Petteri Räty
2011-04-27 15:11 Petteri Räty
2011-04-20 14:04 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-12 18:29 Petteri Räty
2011-04-12 18:29 Petteri Räty
2011-04-04 16:09 Petteri Räty
2011-04-03 13:09 Petteri Räty
2011-04-03 10:16 Petteri Räty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox
  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):
  git send-email \
    --in-reply-to=67ae08a05b489c31f9df7453eea3ed8446d4f5ae.betelgeuse@gentoo \
    --to=betelgeuse@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY
  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
  Be sure your reply has a Subject: header at the top and a blank line
  before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox