From da6f63bb3d0bb15a667878e268f9fdcb69891be0 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Mon, 11 Jun 2007 05:51:19 +0000
Subject: [PATCH] Fix calling convention by managing top of stack and adjusting
 on way in and out of function calls.

---
 src/main/java/lua/Builtin.java      | 16 ++++++++--------
 src/main/java/lua/io/Closure.java   |  6 +++---
 src/main/java/lua/value/LTable.java |  7 ++++---
 src/main/java/lua/value/LValue.java |  3 +--
 src/test/res/test3.lua              |  3 ++-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/lua/Builtin.java b/src/main/java/lua/Builtin.java
index 1aea5ae6..034a995a 100644
--- a/src/main/java/lua/Builtin.java
+++ b/src/main/java/lua/Builtin.java
@@ -31,23 +31,23 @@ final class Builtin extends LFunction {
 	}
 	
 	// perform a lua call
-	public int luaStackCall(StackState state, int base, int nargs) {
+	public void luaStackCall(StackState state, int base) {
 		switch ( id ) {
 		case PRINT:
-			for ( int i=0; i<nargs; i++ ) {
-				if ( i > 0 )
-					System.out.print( "\t" );
-				System.out.print( String.valueOf(state.stack[base+1+i]) );
+			for ( int i=base+1, n=state.top; i<n; i++ ) {
+				System.out.print( String.valueOf(state.stack[i]) );
+				System.out.print( "\t" );
 			}
 			System.out.println();
-			return 0;
+			return;
 		case PAIRS:
+			state.adjustTop(base+2);
 			LValue value = state.stack[base+1].luaPairs();
 			state.stack[base] = value;
-			return 1;
+			state.adjustTop(base+1);
+			return;
 		default:
 			luaUnsupportedOperation();
-			return 0;
 		}
 	}
 
diff --git a/src/main/java/lua/io/Closure.java b/src/main/java/lua/io/Closure.java
index e0e057f3..9c6b5544 100644
--- a/src/main/java/lua/io/Closure.java
+++ b/src/main/java/lua/io/Closure.java
@@ -17,8 +17,8 @@ public class Closure extends LValue {
 
 
 	// perform a lua call
-	public int luaStackCall(StackState state, int base, int nargs) {
-		state.clear( base+1+nargs, p.numparams-nargs );
-		return state.vmExecute( this, base+1 );
+	public void luaStackCall(StackState state, int base) {
+		state.adjustTop( base+1+p.numparams );
+		state.vmExecute( this, base+1 );
 	}
 }
diff --git a/src/main/java/lua/value/LTable.java b/src/main/java/lua/value/LTable.java
index 38d10658..cc91550e 100644
--- a/src/main/java/lua/value/LTable.java
+++ b/src/main/java/lua/value/LTable.java
@@ -50,14 +50,15 @@ public class LTable extends LValue {
 		}
 
 		// perform a lua call
-		public int luaStackCall(StackState state, int base, int nargs) {
+		public void luaStackCall(StackState state, int base) {
 			if ( e.hasMoreElements() ) {
 				LValue key = (LValue) e.nextElement();
+				state.adjustTop(base+2);
 				state.stack[base] = key;
 				state.stack[base+1] = t.luaGetTable(key);
-				return 2;
+			} else {
+				state.adjustTop(base);
 			}
-			return 0;			
 		}
 	}
 
diff --git a/src/main/java/lua/value/LValue.java b/src/main/java/lua/value/LValue.java
index 47d11713..eb0a5cd8 100644
--- a/src/main/java/lua/value/LValue.java
+++ b/src/main/java/lua/value/LValue.java
@@ -15,9 +15,8 @@ public class LValue {
 	}
 
 	// perform a lua call, return number of results actually produced
-	public int luaStackCall(StackState state, int base, int nargs) {
+	public void luaStackCall(StackState state, int base) {
 		luaUnsupportedOperation();
-		return 0;
 	}
 
 	// unsupported except for numbers
diff --git a/src/test/res/test3.lua b/src/test/res/test3.lua
index ca4464c6..01006118 100644
--- a/src/test/res/test3.lua
+++ b/src/test/res/test3.lua
@@ -1,3 +1,4 @@
+
 function f0() print( "f0:" ) end
 function f1(a) print( "f1:", a ) end
 function f2(a,b) print( "f2:", a, b ) end
@@ -24,7 +25,7 @@ z = g4("c4.1/4", "c4.2/4", "c4.3/4", "c4.4/4")
 print( "z4:", z )
 
 a,b,c,d = g0( "c0.1/4", "c0.2/4", "c0.3/4", "c0.4/4" )
-print( "g0:", a, b, c, d, "(eol" )
+print( "g0:", a, b, c, d, "(eol)" )
 a,b,c,d = g2( "b2.1/4", "b2.2/4", "b2.3/4", "b2.4/4" )
 print( "g2:", a, b, c, d, "(eol)" )
 a,b,c,d = g4( "b4.1/4", "b4.2/4", "b4.3/4", "b4.4/4" )