From b6f123d5e594abe00ea7cc2a95ea463542c7495b Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Tue, 12 Jun 2007 06:22:55 +0000
Subject: [PATCH] Improve vararg handling logic.

---
 src/main/java/lua/Builtin.java    |  8 +++++---
 src/main/java/lua/io/Closure.java |  3 ++-
 src/test/res/test3.lua            | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/lua/Builtin.java b/src/main/java/lua/Builtin.java
index 034a995a..fffe1bab 100644
--- a/src/main/java/lua/Builtin.java
+++ b/src/main/java/lua/Builtin.java
@@ -32,6 +32,7 @@ final class Builtin extends LFunction {
 	
 	// perform a lua call
 	public void luaStackCall(StackState state, int base) {
+		int returnValues = 0;
 		switch ( id ) {
 		case PRINT:
 			for ( int i=base+1, n=state.top; i<n; i++ ) {
@@ -39,16 +40,17 @@ final class Builtin extends LFunction {
 				System.out.print( "\t" );
 			}
 			System.out.println();
-			return;
+			break;
 		case PAIRS:
 			state.adjustTop(base+2);
 			LValue value = state.stack[base+1].luaPairs();
 			state.stack[base] = value;
-			state.adjustTop(base+1);
-			return;
+			returnValues = 1;
+			break;
 		default:
 			luaUnsupportedOperation();
 		}
+		state.adjustTop(base-1+returnValues);
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/lua/io/Closure.java b/src/main/java/lua/io/Closure.java
index 9c6b5544..a05d37da 100644
--- a/src/main/java/lua/io/Closure.java
+++ b/src/main/java/lua/io/Closure.java
@@ -18,7 +18,8 @@ public class Closure extends LValue {
 
 	// perform a lua call
 	public void luaStackCall(StackState state, int base) {
-		state.adjustTop( base+1+p.numparams );
+		if ( (! p.is_vararg) || (state.top < base+1+p.numparams) )
+			state.adjustTop( base+1+p.numparams );
 		state.vmExecute( this, base+1 );
 	}
 }
diff --git a/src/test/res/test3.lua b/src/test/res/test3.lua
index 01006118..77f19aa0 100644
--- a/src/test/res/test3.lua
+++ b/src/test/res/test3.lua
@@ -39,3 +39,17 @@ print( func(11, 12, 13) )
 print( func(23, 22, 21) )
 print( func(func(32,33,34), func(45,46,47), func(58,59,50)) )
 
+--[[
+function p(a,...)
+	print("a",a)
+	print("a,...",a,...)
+	print("...",...)
+	print("...,a",...,a)
+end
+local aa,bb,cc,dd
+p()
+p("q")
+p("q","r")
+p("q","r","s")
+print(aa,bb,cc,dd)
+--]]