From be205817315dbb8cc49f0101cf7f52266ddb21d3 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Fri, 15 Jun 2007 06:41:40 +0000
Subject: [PATCH] Improve call stack handling to prepare for propert tail call
 handling.

---
 pom.xml                                |   2 +-
 src/main/java/lua/Builtin.java         |   6 ++---
 src/main/java/lua/io/Closure.java      |  31 +++++--------------------
 src/main/java/lua/io/Proto.java        |   5 ++++
 src/main/java/lua/value/LFunction.java |   4 +++-
 src/main/java/lua/value/LTable.java    |   2 +-
 src/main/java/lua/value/LValue.java    |   2 +-
 src/test/res/compile.sh                |   2 +-
 src/test/res/test2.luac                | Bin 761 -> 1321 bytes
 src/test/res/test3.luac                | Bin 629 -> 4117 bytes
 10 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7436a363..1beaf906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,6 @@
     <name>LuaJ Interpreter</name>
 
     <build>
-        <finalName>LuaJ</finalName>
+        <finalName>luaj</finalName>
     </build>
 </project>
diff --git a/src/main/java/lua/Builtin.java b/src/main/java/lua/Builtin.java
index fffe1bab..d1cafeb3 100644
--- a/src/main/java/lua/Builtin.java
+++ b/src/main/java/lua/Builtin.java
@@ -27,15 +27,15 @@ final class Builtin extends LFunction {
 	}
 
 	public String toString() {
-		return "Builtin('"+NAMES[id]+"')";
+		return "builtin."+NAMES[id];
 	}
 	
 	// perform a lua call
-	public void luaStackCall(StackState state, int base) {
+	public void luaStackCall(StackState state, int base, int top) {
 		int returnValues = 0;
 		switch ( id ) {
 		case PRINT:
-			for ( int i=base+1, n=state.top; i<n; i++ ) {
+			for ( int i=base+1; i<top; i++ ) {
 				System.out.print( String.valueOf(state.stack[i]) );
 				System.out.print( "\t" );
 			}
diff --git a/src/main/java/lua/io/Closure.java b/src/main/java/lua/io/Closure.java
index 64c1fd8b..b6caa492 100644
--- a/src/main/java/lua/io/Closure.java
+++ b/src/main/java/lua/io/Closure.java
@@ -1,8 +1,6 @@
 package lua.io;
 
 import lua.StackState;
-import lua.value.LInteger;
-import lua.value.LNil;
 import lua.value.LValue;
 
 public class Closure extends LValue {
@@ -17,29 +15,12 @@ public class Closure extends LValue {
 			upVals[i] = new UpVal( p.upvalues[i] );
 	}
 
-
 	// perform a lua call
-	public void luaStackCall(StackState state, int base) {
-		// skip over closure
-		base++;
-		if ( p.is_vararg ) {
-			
-			// adjust stack to bury varargs under base
-			int top = state.top;
-			int nsupplied = top-base;
-			int nrequired = p.numparams;
-			int nvarargs = Math.max( 0, nsupplied - nrequired );
-			for ( int i=0; i<nrequired; i++ )
-				state.stack[top+i+1] = (i<nsupplied? state.stack[base+i]: LNil.NIL);
-			state.stack[top] = new LInteger( nvarargs );
-			state.top = top + nrequired + 1;
-			base = top+1;
-			
-		} else {
-			
-			// normal non-varargs call
-			state.adjustTop( base+p.numparams );
-		}
-		state.vmExecute( this, base );
+	public void luaStackCall(StackState state, int base, int top) {
+		state.setupCall( this, base, top );
+	}
+
+	public String toString() {
+		return "closure: "+hashCode();
 	}
 }
diff --git a/src/main/java/lua/io/Proto.java b/src/main/java/lua/io/Proto.java
index 516fab4a..e2f4d8aa 100644
--- a/src/main/java/lua/io/Proto.java
+++ b/src/main/java/lua/io/Proto.java
@@ -36,4 +36,9 @@ public class Proto extends LValue {
 	public int numparams;
 	public boolean is_vararg;
 	public int maxstacksize;
+
+
+	public String toString() {
+		return "proto: "+hashCode();
+	}
 }
diff --git a/src/main/java/lua/value/LFunction.java b/src/main/java/lua/value/LFunction.java
index 89f5b0d0..36e6911a 100644
--- a/src/main/java/lua/value/LFunction.java
+++ b/src/main/java/lua/value/LFunction.java
@@ -2,6 +2,8 @@ package lua.value;
 
 public class LFunction extends LValue {
 
-	
+	public String toString() {
+		return "function: "+hashCode();
+	}
 	
 }
diff --git a/src/main/java/lua/value/LTable.java b/src/main/java/lua/value/LTable.java
index cc91550e..7c88c37e 100644
--- a/src/main/java/lua/value/LTable.java
+++ b/src/main/java/lua/value/LTable.java
@@ -50,7 +50,7 @@ public class LTable extends LValue {
 		}
 
 		// perform a lua call
-		public void luaStackCall(StackState state, int base) {
+		public void luaStackCall(StackState state, int base, int top) {
 			if ( e.hasMoreElements() ) {
 				LValue key = (LValue) e.nextElement();
 				state.adjustTop(base+2);
diff --git a/src/main/java/lua/value/LValue.java b/src/main/java/lua/value/LValue.java
index 01ec8db6..21297293 100644
--- a/src/main/java/lua/value/LValue.java
+++ b/src/main/java/lua/value/LValue.java
@@ -16,7 +16,7 @@ public class LValue {
 	}
 
 	// perform a lua call, return number of results actually produced
-	public void luaStackCall(StackState state, int base) {
+	public void luaStackCall(StackState state, int base, int top) {
 		luaUnsupportedOperation();
 	}
 
diff --git a/src/test/res/compile.sh b/src/test/res/compile.sh
index 4a25c1b7..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="test2"
+TESTS="test3"
 for x in $TESTS
 do
     echo compiling $x
diff --git a/src/test/res/test2.luac b/src/test/res/test2.luac
index 920e47e46a9003680dd0c5836aa6a7f5c02ed765..9e6d15f493eff022e92982ab63ca356e82f4620f 100644
GIT binary patch
literal 1321
zcmcIjONtah5PgxAJ>5DYe%cRq<3bw|ky*G^FjI78DY%z`c1A&*8O7-a-DQfR3ooF|
z(o49TT6hZ&;SqdMRY8Af#f=Fs^Tj74A|t8><#hZA;=S)-9YB~o-Jjgp*qM$g*mCP7
z>4@kOodDe9nG;YQ0wRJK1&@*3khYm!XcyWYZCJDghblQp<q)Mnjs>b*XpCY$#s}u9
zm`5tmPv|E&NXh-6UNZAm)G_|g1lJMzM2DOin{mYzh<6zKU4davMXc)hbsZzt*@bUw
z^~k|%jZ){PJ|>TE%nQ^TK2mp?QuDSY|DgR?)LrDg)AaYA+x~PHevRbS>*sqD6l7e#
zZnp%XB|Rf2jP#A1H!?JG$;ima6(d)TTr+ar$VTv8=H7k#Y`V9F;_DY(-`h&keRBg_
z$rshzT93ydCOOMya0DnLk&`PWyG@Q)->Uxh9K8m;<mRBpd1&xXYajD$J}tfRWI@_m
zkhYg3ji~Rjb(G|o3IYxvct~tg(h_Z{UcYpO`fBN#_YKjonsCzro>QH`YvjAcdqz6s
zdB8W9DNzPKBgiM7mT9gT{XjkRa(@NRP-kFwn`As^<s50HaosGF)c&H5`f_LcK{HGJ
zLp`C%wXuJLev5yCw)0=01OA`T(P-a}ufR#_P7yksWn7?c83XE8LHnpVW?j5VDG*JE
JZ?zH+{02f~W3m7M

delta 237
zcmZ3<^^<jiI-|)%jq|K>3=IqdlVcdC)-y6d0ElJ=F<BT`S%DOfBM>(-F!3B@V3K2G
zU<B!a0gyZs8V2cQfr=#pX#_6`g_n%NOEH6UK@1Zh1{nl$49GB?c=A1F@yTzQRVK5t
Rm`s*skpW>IcAyRz0032S5mEpE

diff --git a/src/test/res/test3.luac b/src/test/res/test3.luac
index 57f81fb6ae27556f1b5d38db5f447ceddeeda9b2..f6e5050c89cfaff660cb1a8cbe2f1529c7aa9d0b 100644
GIT binary patch
literal 4117
zcmb_f%Wfk@6us4U`<3S)o|-Tqu!g`Qi5&wHtLjA<A;E(EY@B3bA&rL7kZf30FCu<o
zKBjvS@e?C{f*;_Vs=D26<Bqa$N!Rz>s(a5pu7{&M{`qG9tC()LJCH3AvDYvDxIR64
zc{4|#BN_Y)IEMA<Ej(=O;9=te9yS((bt9>W99ZXlW(}|y&SlO>UNCkcmPB%!Na+&h
zBtECWoOGnL9Wi-_xk+jxAAH3}+~i}t%E!5Nd@l0ASA4`xKE|tjoLk3NL_YY6kGRRl
zc$JTH>-fa)5%$m2e8f#Y#;bgsTf;ZDIG3V>^Wyn*abEBi9`$_(Z{drsq{zu^D!EIg
zEYRKb<iNS4FR7%qhyFde1@`BM`mE^Ttok@BoO<40&Mo?NF1Rxp;H(EY>w%bZu$(Ky
zM(!F7Hc$SRk^EH*<(V5w-wuNwJCa-AJItl!P|nOq@_a;noz&|?j7weGE$G|Ad<##p
z)z0I!Z$tYwv~NTEb~}&kwDOD{_So)t-DmK*+rb|1V2^j@xk!ThU$5C+^x8$Q|F7Mm
zwv;_F*`8$ip1gIE++og?h|Rv_*}lBPT$=4*9dWrYrFkR=MiTUac9AFI<P5mm!N=7}
z^pohP(Vs>?lP(|Td~%G8h>+va^jOj482NEd(P=d|IaZcwg-$CpBchf?)Ut?L7E#M0
zYFQvJLEfLz<?qnN$&n|H*i%RB$s_jkJ><WB^V_Ry>2}F*@<Zg9HaMn7HOKU*=9nIN
z4qrIc!datm)+n4c3TKVN844+W9^83w7r|WySqsXd)Wa9Qzx+BVJZ~rjt`q`S3V|zy
z3srdDPzYQXHWXsME~G*p;nmHn3*mWSJhc%VD)>gh_X@sK@T~$Hfm49rmB8bE)SPEJ
zqd<Pq83pnaUTzrNIT{_$fjTqm@3Y~3=9=HR#vxx}H#wNE_3HgX{Gc+g&V=uOhB&t(
z1^jdTt!m|;1b%8!j;1%5XTLctsPG_Ss={)Q$9)ScEk00Ujgz-llGd&`Uk=uhW1Z=@
z44tWuGv~0da~?#@RmdOkwcNo>MhzkkI`D_Wyu)AMRxPJN3v0>KX55u}C#byEqtOLs
z!?*GvVy@yVjs|ckRAo@-;0ve&iLr?@2bpwQ72;BJu%2A^nckB*3xwaPR;f`?snKPX
z=>a}=qd~KO?bJonK}OA4?uRec=%-QWr%~v~NXH%kP5b?W16=K=Ih*LWk5)AF>yZyP
z)>wl#LKDXsKe(p3>X-ZLojCXT8intx(Pg#f0X`l@L;pT+o8TVcwxT;Vgjd694z6o{
z(=Y4LDCp2A=+NlW^D)x#9smtG2L6uXP%O0IZki(OhkrGi&m65;_1b0blc~DCcNzsf
z8U;O!bbJ9YX3&uy=L=#J_6B!iNekD%Trt+_t_K~es%>9TApEa@T4}7Nv5v+rG<|V=
zft$1;_%>-H@NLrgmur)@4Zcm9{tD@@gT7LIDSAuaN8dL40BcSA5OJG*gtex9jJVA{
z!CKQEBYub-An!i=6zdPMC&;_cKEwJ$>~rMZXMA;hxlix0udvo;hgjRBfzFTr0GRqd
A?f?J)

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