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

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

commit:     8d058790d54382de2979b06f0268c9bf8a425438
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 10:59:30 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 11:41:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=8d058790

Walker: fix for-loop for no items

In for loop, if there are no items in the expansion of words, no
commands are executed, and the return status is zero.

---
 bashast/libbashWalker.g              |   31 ++++++++++++++++++++-----------
 scripts/compound_command.bash        |    7 +++++++
 scripts/compound_command.bash.result |    1 +
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index e793f56..ddbf669 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -649,19 +649,28 @@ for_expr
 		}
 		)+
 		{
-			commands_index = INDEX();
-			for(auto iter = splitted_values.begin(); iter != splitted_values.end(); ++iter)
+			if(splitted_values.empty())
 			{
-				SEEK(commands_index);
-				walker->set_value(libbash_string, *iter);
-				try
-				{
-					command_list(ctx);
-				}
-				catch(continue_exception& e)
+				//skip the body
+				seek_to_next_tree(ctx);
+				walker->set_status(0);
+			}
+			else
+			{
+				commands_index = INDEX();
+				for(auto iter = splitted_values.begin(); iter != splitted_values.end(); ++iter)
 				{
-					e.rethrow_unless_correct_frame();
-					continue;
+					SEEK(commands_index);
+					walker->set_value(libbash_string, *iter);
+					try
+					{
+						command_list(ctx);
+					}
+					catch(continue_exception& e)
+					{
+						e.rethrow_unless_correct_frame();
+						continue;
+					}
 				}
 			}
 		})

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index 7a4e526..5a04beb 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -8,6 +8,13 @@ do
     echo $foo
 done
 
+bar=
+# We behave differently from bash with "for foo in ''"
+for foo in $bar
+do
+    echo "Shouldn't print this"
+done
+
 for (( i=1; i<4; ++i ))
 do
     echo $i

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
index 0450c8f..aeef870 100644
--- a/scripts/compound_command.bash.result
+++ b/scripts/compound_command.bash.result
@@ -50,6 +50,7 @@ yep
 case end
 a=1
 b=2
+bar=
 file=bar
 foo=ghi
 i=4