From 99077764acae39ac3196919fa7a119bccc07daed Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Tue, 19 Jun 2007 04:25:34 +0000
Subject: [PATCH] Fix basic class processing via metatables. Make print output
 more closely match that produces by C interpreter

---
 src/main/java/lua/Builtin.java         |   5 ++-
 src/main/java/lua/io/Closure.java      |   7 +---
 src/main/java/lua/io/Proto.java        |   4 +-
 src/main/java/lua/io/UpVal.java        |   2 +-
 src/main/java/lua/value/LFunction.java |   2 +-
 src/main/java/lua/value/LTable.java    |   6 ++-
 src/main/java/lua/value/LValue.java    |   4 ++
 src/test/res/test6.lua                 |  51 +++++++++++++++++++++++++
 src/test/res/test6.luac                | Bin 1337 -> 3863 bytes
 9 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/src/main/java/lua/Builtin.java b/src/main/java/lua/Builtin.java
index 985b065e..b869e046 100644
--- a/src/main/java/lua/Builtin.java
+++ b/src/main/java/lua/Builtin.java
@@ -36,7 +36,7 @@ final class Builtin extends LFunction {
 		switch ( id ) {
 		case PRINT:
 			for ( int i=base+1; i<top; i++ ) {
-				System.out.print( String.valueOf(state.stack[i]) );
+				System.out.print( state.stack[i].luaAsString() );
 				System.out.print( "\t" );
 			}
 			System.out.println();
@@ -53,7 +53,8 @@ final class Builtin extends LFunction {
 			break;
 		case SETMETATABLE:
 			state.stack[base+1].luaSetMetatable(state.stack[base+2]);
-			state.top = base;
+			state.stack[base] = state.stack[base+1];
+			state.top = base+1;
 			break;
 		default:
 			luaUnsupportedOperation();
diff --git a/src/main/java/lua/io/Closure.java b/src/main/java/lua/io/Closure.java
index 2e1c17e8..e2495c28 100644
--- a/src/main/java/lua/io/Closure.java
+++ b/src/main/java/lua/io/Closure.java
@@ -1,9 +1,10 @@
 package lua.io;
 
 import lua.StackState;
+import lua.value.LFunction;
 import lua.value.LValue;
 
-public class Closure extends LValue {
+public class Closure extends LFunction {
 	public LValue env;
 	public Proto p;
 	public UpVal[] upVals;
@@ -19,8 +20,4 @@ public class Closure extends LValue {
 	public void luaStackCall(StackState state, int base, int top, int nresults) {
 		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 e2f4d8aa..905c4536 100644
--- a/src/main/java/lua/io/Proto.java
+++ b/src/main/java/lua/io/Proto.java
@@ -38,7 +38,7 @@ public class Proto extends LValue {
 	public int maxstacksize;
 
 
-	public String toString() {
-		return "proto: "+hashCode();
+	public String luaAsString() {
+		return "proto: "+id();
 	}
 }
diff --git a/src/main/java/lua/io/UpVal.java b/src/main/java/lua/io/UpVal.java
index b04e2708..a4e54eb2 100644
--- a/src/main/java/lua/io/UpVal.java
+++ b/src/main/java/lua/io/UpVal.java
@@ -14,7 +14,7 @@ public class UpVal {
 	}
 		
 	public String toString() {
-		return "up("+name+")";
+		return "up."+name;
 	}
 
 }
diff --git a/src/main/java/lua/value/LFunction.java b/src/main/java/lua/value/LFunction.java
index 9b3b2cc0..c86e9b90 100644
--- a/src/main/java/lua/value/LFunction.java
+++ b/src/main/java/lua/value/LFunction.java
@@ -4,7 +4,7 @@ import lua.StackState;
 
 public class LFunction extends LValue {
 
-	public String toString() {
+	public String luaAsString() {
 		return "function: "+hashCode();
 	}
 
diff --git a/src/main/java/lua/value/LTable.java b/src/main/java/lua/value/LTable.java
index 879eeb4b..ffbeaf65 100644
--- a/src/main/java/lua/value/LTable.java
+++ b/src/main/java/lua/value/LTable.java
@@ -50,10 +50,14 @@ public class LTable extends LValue {
 		state.stack[base] = val;
 	}
 	
-	public String luaAsString() {
+	public String toString() {
 		return m_hash.toString();
 	}
 	
+	public String luaAsString() {
+		return "table: "+id();
+	}
+	
 	/** Built-in opcode LEN, for Strings and Tables */
 	public LValue luaLength() {
 		return new LInteger( m_hash.size() );
diff --git a/src/main/java/lua/value/LValue.java b/src/main/java/lua/value/LValue.java
index b5a36297..1f89bc52 100644
--- a/src/main/java/lua/value/LValue.java
+++ b/src/main/java/lua/value/LValue.java
@@ -9,6 +9,10 @@ public class LValue {
 	protected static LValue luaUnsupportedOperation() {
 		throw new java.lang.UnsupportedOperationException();
 	}
+
+	public String id() {
+		return Integer.toHexString(hashCode());
+	}
 	
 	// test if value is true
 	public boolean luaAsBoolean() {
diff --git a/src/test/res/test6.lua b/src/test/res/test6.lua
index 8a750b2b..ab2b4c53 100644
--- a/src/test/res/test6.lua
+++ b/src/test/res/test6.lua
@@ -1,8 +1,11 @@
+
 t = { 11, 22, 33, you='one', me='two' }
 
+print( "---------" )
 for a,b in pairs(t) do
 	print( a, b )
 end
+print( "----" )
 print( "t[2]", t[2] )
 print( "t.me", t.me )
 print( "t.fred", t.fred )
@@ -24,9 +27,11 @@ d = t.you
 t[4] = 'rat'
 t[1] = 'pipe'
 print( a, b, c, d )
+print( "---------" )
 for a,b in pairs(t) do
 	print( a, b )
 end
+print( "----" )
 
 -- delegate to actual metatable
 s = { }
@@ -38,6 +43,52 @@ print( t.x )
 me = 'here'
 print( t.me )
 t[5] = 99
+print( "---------" )
 for a,b in pairs(s) do
 	print( a, b )
 end
+print( "----" )
+
+Vector = {}
+Vector_mt = { __index = Vector }
+
+function Vector:new(x,y)
+   return setmetatable( {x=x, y=y}, Vector_mt)
+end
+ 
+function Vector:mag()
+   return math.sqrt(self:dot(self))
+ end
+ 
+function Vector:dot(v)
+   return self.x * v.x + self.y * v.y
+end
+ 
+v1 = Vector:new(3,4)
+print( "--------" )
+for a,b in pairs(v1) do
+	print( a, b )
+end
+print( "----" )
+
+v2 = Vector:new(2,1)
+print( v2:dot(v1) )
+
+print( Vector )
+
+print( "---------" )
+for a,b in pairs(Vector) do
+	print( a, b )
+end
+print( "----" )
+
+print( v1, v2 )
+
+print( Vector_mt, getmetatable(v1), getmetatable(v2) )
+
+print( "---------" )
+for a,b in pairs(Vector_mt) do
+	print( a, b )
+end
+print( "----" )
+
diff --git a/src/test/res/test6.luac b/src/test/res/test6.luac
index d6cff26b80e8cb297214b2cd2de3007e336c0e90..4df0e621d8c9d18a6b063f30b5adbb44c6497d7a 100644
GIT binary patch
literal 3863
zcmbVO-%ngc6h3#ku<Sw=W5plETANr}wWvg^MonkaF0HLb8{<!kWPuAMVOiY0l;Vqn
z23|1r!RS+Cq7TMD<MIHSH2N2)Z~9<-@Gmfa-^`ue>Fx!BH~E<JeP`yJGiUDH<;ZKx
zl`9g2Vc08uBBJ7`5uX`ZSgwG$C)ax@5GiUMl$6Mt7THQf3aa#JAt`-!T<IW>soj#3
zlFG@DlAv4Xqzr9Hf?zNaT@G@h105uR<gS)<@F-#os((K*Ym#&g*GreIW8H>27Yre;
z@#|F6rIwbYnw)QGDzt0;c{<hnc{-4Fpc!8{Cv5S=uGz+%jYL}Uu|w9jjk!+WuO~$<
z=tB;@l1)46&AjSHq#o0sb=bBJkshTauX^C4U6Q;`ZMh)%#M#hQ-pnZ^7rx-!f?T}G
zK9#X{9c#8Zx0GkxoavwX|7TJ}{JiSL*<&9V3rcU6HAmTHANJhGWDEIm_^2+Q^rGHW
zPkyqxf{y++b#3RH{Uon`*-<xgALLy!bxTo-iv2I9^%jw@C^PJtlCO*nKlWs8>=F9c
z)cf=$S<`*8rO`(%xxDH#wU&}TQ@?q?p&g{AW?a>U?xb<0KkY%kT$bCijhI()Q_#Cq
zFWP+Q-<@|0`T_4&8L`)q&%O6$Rg`trZ*tz!5^Tfn4*KO+;X9vkpE3U+Igg5#Q4tAq
z_!CPP{^B`--J9o3YG|dx5Xx$8S&UIzj3nfwDn@$Zm70V-FqZ1`i?M_}+|%w!J(c--
zLqfhjbXY4MADwV%MHy#2!l3+G#Ur!zXvR*oRxj1@;c7HIVRL}cL(1&&cr}7)r_ljo
z%0x*NCnx6@XQCSt_8GDmt)%=Acq59dQCx{DQwu179jVx1$_~@6(0|Sv?~LOEwmbC-
zvT%D#^Gj&}?3d{$FW3l3%x10BR_w%UQ9W`&4lCRA<UM6J|4uX=*Xnkc)}E{)KG&mc
zYg8+9)|jcm#r4;paq)UpSb)$v1LGc*kXxPew`%i>JP*f<03!6TS=&Hy4HvGYbzx1`
z%3C78;l=+QI$s=?Vxo064jX0vR@=*mCJg<;9$*P9iJfdj3$qyTfdd%v21%2xHkmQ-
z=Oy435`4Fqs0@s$L^ideCbv-k1hfwU?tzKSnN=(CHET6Ks;7NsSNSl|%X@$c5xcWu
zXy!SKza?5Z>E@wqh>{&i<Ypqlj#AQ7O5_(=3qA+`2C-NfcWav1>?H$mwb}>F#MO5+
zkb9tb9k4s%$p0Cr?gewqn8T4FeelltppTr{99VKY_<3jtuVg#=p|ykWZ#(XS=HqT~
z9|Pc7xCeR`4nyAy_rafqLFhj22X}Y?w!?$49Ug-1a0E6nl;UBGSvU&a;StzAj)D82
zkNmiY$6ymDcEK=oA1A?moB}5vZ^IMd#FK3}4Ni=BcnY?Ur@?*DN6z0Thi73E&$YpQ
zx;VN|07rN6IG)=D=b<~4Vfz>Z_dy@|MGu!?XW=sREW8fg;SJahZ^HI*1>6UH<ZpR+
z8@7*k!S}=anB(vPY#-y`KIkLoC({Sty#e6lY^{E5E?SK6+gGcfGIx;of_K*V8u&ep
zS~~Bj(Wh&RalN+C^6(2(F?aS}SY%U8mX)c286N}fnVjC4$$4z17;E`sVlz3GmFZi|
z`XM8e(>pUckInQQ)_&j2<XBdw9nAVUBa_oRGdYjV^dr{ZZf0^UE7KpC^>;=lr*~#@
o9-HY;to^H*$+4_Vxd2~(p#7Yj-kHgHY^E-(%>!gp;uwhh2M&eL<^TWy

literal 1337
zcma)*OK;Oa5XWa7J8sHD6_oI3K=eUr0dWCUhzo0}h6@*NNK^_=y3k0e9XXByC$`W?
zaNs++2jJ`Q2@wDBdKD{;D3*Sn`OoY;EZZwDN6{-1uInz)IU<so8fH5W`=bcLUd}=n
z?xNNrkVHqC=p-j<$l!A$55BBPE&Tt=6NTDAojxw@#3zS5s!@pg3H%m%dGPB}k}qq>
zu^*7HOP_Yh&#jNRbc-{MeD@olZBY2t!;BEM6V&|Rvw_Qf9Z!12oE8bu%t?nw4r!r9
zF38ynv{=<dP5I~3BKr8+!}IdK9`8E|^THm_-IwQ~<~f~U4w}n4`BbN3k0Sol#5Lkt
zOyk;|H+%p3UhIc?XYF^3G~GmB*TF5L8t%9@W$Emcj+WAOk@%R5sBn^4k;{h;VL6kH
zlQNJIUO!R0-HZ3t2XgBWgR~bT&L2g)9jkGfx&S>?*`dm!Eb8>pir0vY=@`?sOZ|RU
zWcRIJGApGK8uMchdIK~lrbWGUXsTg&%k~Q+u?{agPR6F@K&8s|TP~k9e=Tu@x<H)4
zCFK9bW#s3vjChqR(3U2A%T@T6Yw#`C;WIZ%R$%ARLc9vU=_;IKy;`ycJCAk5t8745
zxdY8?&Tto+*_vS+nz=W_edsEjXZ-;1pR@$F-X-bn_bOI+@kzQ(j}Utb&fDA&ACsEK
wFWPuFiL*56Pc!CQdyM=Oz^X%5&71V5IB|NCjh~)mGiK5r>fZu0$tncsFQ+h_00000