From 05cfdaa33b7bc7e7a0c27816f1e808d68dd33947 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Mon, 11 Jun 2007 04:30:03 +0000
Subject: [PATCH] Improve calling convention handling when the number of
 arguments doesn't match the expected number, and the number of return values
 doesn't match those needed.

---
 src/main/java/lua/Builtin.java      |   8 +++---
 src/main/java/lua/io/Closure.java   |   5 ++--
 src/main/java/lua/value/LTable.java |   7 +++--
 src/main/java/lua/value/LValue.java |   5 ++--
 src/test/res/compile.sh             |   2 +-
 src/test/res/test3.lua              |  40 +++++++++++++++++++++++++---
 src/test/res/test3.luac             | Bin 283 -> 629 bytes
 7 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/main/java/lua/Builtin.java b/src/main/java/lua/Builtin.java
index 1ebd522c..1aea5ae6 100644
--- a/src/main/java/lua/Builtin.java
+++ b/src/main/java/lua/Builtin.java
@@ -4,6 +4,7 @@
 package lua;
 
 import lua.value.LFunction;
+import lua.value.LNil;
 import lua.value.LString;
 import lua.value.LTable;
 import lua.value.LValue;
@@ -30,7 +31,7 @@ final class Builtin extends LFunction {
 	}
 	
 	// perform a lua call
-	public void luaStackCall(StackState state, int base, int nargs) {
+	public int luaStackCall(StackState state, int base, int nargs) {
 		switch ( id ) {
 		case PRINT:
 			for ( int i=0; i<nargs; i++ ) {
@@ -39,13 +40,14 @@ final class Builtin extends LFunction {
 				System.out.print( String.valueOf(state.stack[base+1+i]) );
 			}
 			System.out.println();
-			return;
+			return 0;
 		case PAIRS:
 			LValue value = state.stack[base+1].luaPairs();
 			state.stack[base] = value;
-			return;
+			return 1;
 		default:
 			luaUnsupportedOperation();
+			return 0;
 		}
 	}
 
diff --git a/src/main/java/lua/io/Closure.java b/src/main/java/lua/io/Closure.java
index 72344631..e0e057f3 100644
--- a/src/main/java/lua/io/Closure.java
+++ b/src/main/java/lua/io/Closure.java
@@ -17,7 +17,8 @@ public class Closure extends LValue {
 
 
 	// perform a lua call
-	public void luaStackCall(StackState state, int base, int nresults) {
-		state.vmExecute( this, base+1 );
+	public int luaStackCall(StackState state, int base, int nargs) {
+		state.clear( base+1+nargs, p.numparams-nargs );
+		return state.vmExecute( this, base+1 );
 	}
 }
diff --git a/src/main/java/lua/value/LTable.java b/src/main/java/lua/value/LTable.java
index 09d649b8..38d10658 100644
--- a/src/main/java/lua/value/LTable.java
+++ b/src/main/java/lua/value/LTable.java
@@ -50,15 +50,14 @@ public class LTable extends LValue {
 		}
 
 		// perform a lua call
-		public void luaStackCall(StackState state, int base, int nresults) {
+		public int luaStackCall(StackState state, int base, int nargs) {
 			if ( e.hasMoreElements() ) {
 				LValue key = (LValue) e.nextElement();
 				state.stack[base] = key;
 				state.stack[base+1] = t.luaGetTable(key);
-			} else {
-				state.stack[base] = LNil.NIL;
+				return 2;
 			}
-			
+			return 0;			
 		}
 	}
 
diff --git a/src/main/java/lua/value/LValue.java b/src/main/java/lua/value/LValue.java
index 1440d4aa..47d11713 100644
--- a/src/main/java/lua/value/LValue.java
+++ b/src/main/java/lua/value/LValue.java
@@ -14,9 +14,10 @@ public class LValue {
 		return true;
 	}
 
-	// perform a lua call
-	public void luaStackCall(StackState state, int base, int nargs) {
+	// perform a lua call, return number of results actually produced
+	public int luaStackCall(StackState state, int base, int nargs) {
 		luaUnsupportedOperation();
+		return 0;
 	}
 
 	// unsupported except for numbers
diff --git a/src/test/res/compile.sh b/src/test/res/compile.sh
index febb2b50..de48a029 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="test5"
+TESTS="test3"
 for x in $TESTS
 do
     echo compiling $x
diff --git a/src/test/res/test3.lua b/src/test/res/test3.lua
index c14ca29b..ca4464c6 100644
--- a/src/test/res/test3.lua
+++ b/src/test/res/test3.lua
@@ -1,6 +1,40 @@
-a = func(1, 2, 3)
-a = func(3, 2, 1)
-a = func(func(),func(),func())
+function f0() print( "f0:" ) end
+function f1(a) print( "f1:", a ) end
+function f2(a,b) print( "f2:", a, b ) end
+function f3(a,b,c) print( "f3:", a, b, c ) end
+function f4(a,b,c,d) print( "f4:", a, b, c, d ) end
 
+f0()  f0( "a1/1" ) f0( "a1/2", "a2/2" ) f0( "a1/3", "a2/3", "a3/3" ) f0( "a1/4", "a2/4", "a3/4", "a4/4" )
+f1()  f1( "a1/1" ) f1( "a1/2", "a2/2" ) f1( "a1/3", "a2/3", "a3/3" ) f1( "a1/4", "a2/4", "a3/4", "a4/4" )
+f2()  f2( "a1/1" ) f2( "a1/2", "a2/2" ) f2( "a1/3", "a2/3", "a3/3" ) f2( "a1/4", "a2/4", "a3/4", "a4/4" )
+f3()  f3( "a1/1" ) f3( "a1/2", "a2/2" ) f3( "a1/3", "a2/3", "a3/3" ) f3( "a1/4", "a2/4", "a3/4", "a4/4" )
+f4()  f4( "a1/1" ) f4( "a1/2", "a2/2" ) f4( "a1/3", "a2/3", "a3/3" ) f4( "a1/4", "a2/4", "a3/4", "a4/4" )
 
+function g0(a,b,c,d) return end
+function g1(a,b,c,d) return d end
+function g2(a,b,c,d) return c, d end
+function g3(a,b,c,d) return b, c, d end
+function g4(a,b,c,d) return a, b, c, d end
+
+z = g0("c0.1/4", "c0.2/4", "c0.3/4", "c0.4/4")
+print( "z0:", z )
+z = g2("c2.1/4", "c2.2/4", "c2.3/4", "c2.4/4")
+print( "z2:", z )
+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" )
+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" )
+print( "g4:", a, b, c, d, "(eol)" )
+
+function func(a,b,c)
+	return a, b, c
+end
+
+print( func(11, 12, 13) )
+print( func(23, 22, 21) )
+print( func(func(32,33,34), func(45,46,47), func(58,59,50)) )
 
diff --git a/src/test/res/test3.luac b/src/test/res/test3.luac
index 296ef9ecf5ff1889a514663e4f51a8339b9b0979..57f81fb6ae27556f1b5d38db5f447ceddeeda9b2 100644
GIT binary patch
literal 629
zcmb`Eze)o^5XQgR-Ae*isSQ>^LJAu(Y4-{hK?{4E7$OJ~MDO~&B5&ctWDDOS<XQYC
zxk;g<bKtxE%{Tk+W>4?y*&`%`(8CFUSS>!Q%Zs;q#>B$)hD24DDk5;ru}MH)10sSa
zzzyghYEh7rK=R+(ifc0*q;x17hpz<pO;0j&@n}kq4ZT9ZI`iz2C14<MJO_Ht84~*B
zQ1J6oFXspy()-8jvVtcu&SMKBgR#NXU}A7(5L-wFD9yRCIk)B*;K3XN+_3}u&~bMY
zkB(k<t+pg^f^6A0{TB<ZyI<0^D)slT658yUBYV(h^FyXEq;!>@uDc$Sw(Xeowf|Gx
GZWll4wk(eT

literal 283
zcmb34DNPJyU}Rxo;b7oqU|?`4Ni8lh*2^hP1ae@2iA4;^WOZO*aBN^;Xgt8caFBtK
zL8gI$i5(^m<b%b5^2p+@4h#%24Gj#fKza_4J_@AoFf@SFFt9T)FvtPftU#KD2}mR|
suz=WUrFqE=%s>VZe6WWy7#yGs4hN7p$UTfWFvuuu7-Rr37^n;k0D?Oi8UO$Q