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

[Petteri Räty]

commit:     4fbd4e219d4c36de28036e02ba616d7faa43e066
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 13:44:07 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=4fbd4e21

Walker: support continue in for loop

A bug in seek_to_next_tree is fixed. This bug can only be reproduced
by c-style for loop. It prevents the c-style for loop from working
properly when a modification statement is specified.

---
 bashast/libbashWalker.g              |   53 ++++++++++++++++++++++++++++------
 scripts/compound_command.bash        |   19 ++++++++++++
 scripts/compound_command.bash.result |    8 ++++-
 3 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index d5522fc..39b84c5 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -71,12 +71,13 @@ options
 	// seek to LT(2) and consume
 	static void seek_to_next_tree(plibbashWalker ctx)
 	{
-		// We start from LA(1)
-		int index = 1;
 		// Current depth of the tree we are traversing
 		int depth = 1;
 
-		for(index = 1; depth != 0; ++index)
+		// The beginning should always be ROOT DOWN ANY_TOKEN
+		// So we start from LA(4)
+		int index = 4;
+		for(; depth != 0; ++index)
 		{
 			// Go one level done if we encounter DOWN
 			if(LA(index) == DOWN)
@@ -87,7 +88,7 @@ options
 		}
 
 		// Seek to the correct offset and consume.
-		SEEK(INDEX() + index - 3);
+		SEEK(INDEX() + index - 2);
 		CONSUME();
 	}
 
@@ -614,7 +615,15 @@ for_expr
 			{
 				SEEK(commands_index);
 				walker->set_value(libbash_string, *iter);
-				command_list(ctx);
+				try
+				{
+					command_list(ctx);
+				}
+				catch(continue_exception& e)
+				{
+					e.rethrow_unless_correct_frame();
+					continue;
+				}
 			}
 		})
 	|^(CFOR {
@@ -625,11 +634,37 @@ for_expr
 			for_initilization(ctx);
 
 		condition_index = INDEX();
-		bool has_condition = (LA(1) != FOR_COND);
-		while(has_condition || for_condition(ctx))
+		bool has_condition = (LA(1) == FOR_COND);
+
+		if(has_condition)
+			seek_to_next_tree(ctx);
+		// before the body
+		seek_to_next_tree(ctx);
+		bool has_modification = (LA(1) == FOR_MOD);
+		ANTLR3_MARKER modification_index = INDEX();
+
+		SEEK(condition_index);
+
+		while(!has_condition || for_condition(ctx))
 		{
-			command_list(ctx);
-			if(LA(1) == FOR_MOD)
+			try
+			{
+				command_list(ctx);
+			}
+			catch(continue_exception& e)
+			{
+				e.rethrow_unless_correct_frame();
+
+				if(has_modification)
+				{
+					SEEK(modification_index);
+					for_modification(ctx);
+				}
+
+				SEEK(condition_index);
+				continue;
+			}
+			if(has_modification)
 				for_modification(ctx);
 			SEEK(condition_index);
 		}

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index daeef24..bb7961c 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -23,6 +23,25 @@ do
     echo "Shouldn't print this"
 done
 
+for file in foo bar
+do
+    if [[ $file == "foo" ]]; then
+        continue
+    fi
+    echo $file
+done
+
+for outer in 1 2 3
+do
+    for file in foo bar
+    do
+        if [[ $file == "foo" && $outer == 1 ]]; then
+            continue 2
+        fi
+        echo "$outer $file"
+    done
+done
+
 i=0;
 while [ $i != 4 ]
 do

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
index 2a23d0c..6014421 100644
--- a/scripts/compound_command.bash.result
+++ b/scripts/compound_command.bash.result
@@ -11,6 +11,11 @@ ghi
 8
 9
 10
+bar
+2 foo
+2 bar
+3 foo
+3 bar
 1
 2
 3
@@ -37,7 +42,8 @@ yep
 case end
 a=1
 b=2
-file= foo bar 
+file=bar
 foo=ghi
 i=4
+outer=3
 target=_