From a9c72414d1df8fcec9e93ba028271484c7b13885 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Sat, 16 Jun 2007 02:47:47 +0000
Subject: [PATCH] Fix for loop that uses iterator

---
 src/main/java/lua/Builtin.java |  10 ++++------
 src/test/res/compile.sh        |   2 +-
 src/test/res/test5.lua         |   6 +++++-
 src/test/res/test5.luac        | Bin 831 -> 831 bytes
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/lua/Builtin.java b/src/main/java/lua/Builtin.java
index 4aad1826..878434ba 100644
--- a/src/main/java/lua/Builtin.java
+++ b/src/main/java/lua/Builtin.java
@@ -32,7 +32,6 @@ final class Builtin extends LFunction {
 	
 	// perform a lua call
 	public void luaStackCall(StackState state, int base, int top) {
-		int returnValues = 0;
 		switch ( id ) {
 		case PRINT:
 			for ( int i=base+1; i<top; i++ ) {
@@ -40,17 +39,16 @@ final class Builtin extends LFunction {
 				System.out.print( "\t" );
 			}
 			System.out.println();
-			break;
+			state.adjustTop(base);
+			return;
 		case PAIRS:
-			state.adjustTop(base+2);
 			LValue value = state.stack[base+1].luaPairs();
+			state.top = base+1;
 			state.stack[base] = value;
-			returnValues = 1;
-			break;
+			return;
 		default:
 			luaUnsupportedOperation();
 		}
-		state.adjustTop(base+returnValues);
 	}
 
 }
\ No newline at end of file
diff --git a/src/test/res/compile.sh b/src/test/res/compile.sh
index 4a25c1b7..5ae390fc 100644
--- a/src/test/res/compile.sh
+++ b/src/test/res/compile.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 LUA_HOME=/cygdrive/c/programs/lua5.1
 TESTS="test1 test2 test3 test4 test5"
-TESTS="test2"
+TESTS="test5"
 for x in $TESTS
 do
     echo compiling $x
diff --git a/src/test/res/test5.lua b/src/test/res/test5.lua
index ebd0c6f1..372b0da1 100644
--- a/src/test/res/test5.lua
+++ b/src/test/res/test5.lua
@@ -1,3 +1,4 @@
+
 i = 777
 while i<780 do
    print(i)
@@ -13,4 +14,7 @@ end
 
 for count = 336,330,-2 do print(count) end  -- numerical iteration
 
-for key,value in pairs({a=10, 3.14159265358, c="banana" }) do print(key, value) end 
+for key,value in pairs({a=10, 3.14159265358, c="banana" }) 
+do 
+	print(key, value) 
+end 
diff --git a/src/test/res/test5.luac b/src/test/res/test5.luac
index 14f39f898ac37688d032b16d5d4e820dd05295b6..cacfbd2a97a15ac602b55dd574add646f2a2a20a 100644
GIT binary patch
delta 177
zcmdnbwx4aoEXK*p7!_n$85kIlF$a(j$CKYPD%W!ZMR>4aexMjWEC`gxg@u4}!e|(z
V79=JD#GF73vQr~1e{v<$F#xUG3s?XE

delta 161
zcmdnbwx4aoEJjX71_lNYW|};mQCX7($YMvsoIpMda{<|4Jo!4KawH#+hYt$?<;lX6
Ivze{{0Kkz6&Hw-a