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

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

commit:     4f4eff53b4ad98e386010f7d9717c3192954a0dc
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 14:22:01 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun May 29 11:44:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=4f4eff53

Walker: support continue in while and until loop

---
 bashast/libbashWalker.g              |   11 ++++++-
 scripts/compound_command.bash        |   52 ++++++++++++++++++++++++++++++++++
 scripts/compound_command.bash.result |    9 ++++++
 3 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index f2fba4a..5c8c371 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -703,7 +703,16 @@ while_expr
 			command_list(ctx);
 			if(walker->get_status() == (negate? 0 : 1))
 				break;
-			command_list(ctx);
+			try
+			{
+				command_list(ctx);
+			}
+			catch(continue_exception& e)
+			{
+				e.rethrow_unless_correct_frame();
+				SEEK(condition_index);
+				continue;
+			}
 			SEEK(condition_index);
 		}
 		// Skip the body and get out

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index bb7961c..a81e395 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -54,6 +54,32 @@ do
     echo "Shouldn't print this"
 done
 
+i=0
+while [ $i != 4 ]
+do
+    i=$(( i + 1 ))
+    if [[ $i == 1 ]]; then
+        continue
+    fi
+    echo $i
+done
+
+i=0
+j=1
+while [ $i != 4 ]
+do
+    i=$(( i + 1 ))
+    
+    while [ $j == 1 ]
+    do
+        if [[ $i == 1 ]]; then
+            continue 2
+        fi
+        echo $i
+        let ++j
+    done
+done
+
 i=0;
 until [ $i == 4 ]
 do
@@ -66,6 +92,32 @@ do
     echo "Shouldn't print this"
 done
 
+i=0
+until [ $i == 4 ]
+do
+    i=$(( i + 1 ))
+    if [[ $i == 1 ]]; then
+        continue
+    fi
+    echo $i
+done
+
+i=0
+j=1
+until [ $i == 4 ]
+do
+    i=$(( i + 1 ))
+    
+    while [ $j == 1 ]
+    do
+        if [[ $i == 1 ]]; then
+            continue 2
+        fi
+        echo $i
+        let ++j
+    done
+done
+
 a=1
 b=2
 if [ $a == $b ]

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
index 6014421..0450c8f 100644
--- a/scripts/compound_command.bash.result
+++ b/scripts/compound_command.bash.result
@@ -20,10 +20,18 @@ bar
 2
 3
 4
+2
+3
+4
+2
 1
 2
 3
 4
+2
+3
+4
+2
 1
 2
 1
@@ -45,5 +53,6 @@ b=2
 file=bar
 foo=ghi
 i=4
+j=2
 outer=3
 target=_