open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix metatable processing

Browse Source
This commit is contained in:
James Roseborough
2008-05-23 14:25:58 +00:00
parent 02631fface
commit 23609197b9
2 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/j2se/org/luaj/lib/j2se/CoerceJavaToLua.java
View File

@@ -24,7 +24,6 @@ package org.luaj.lib.j2se;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.luaj.lib.j2se.LuajavaLib.LInstance;
import org.luaj.vm.LBoolean; import org.luaj.vm.LBoolean;
import org.luaj.vm.LDouble; import org.luaj.vm.LDouble;
import org.luaj.vm.LInteger; import org.luaj.vm.LInteger;
@@ -81,7 +80,7 @@ public class CoerceJavaToLua {
Coercion c = (Coercion) COERCIONS.get( clazz ); Coercion c = (Coercion) COERCIONS.get( clazz );
if ( c != null ) if ( c != null )
return c.coerce( o ); return c.coerce( o );
return new LInstance( o, o.getClass() ); return LuajavaLib.toUserdata( o, clazz );
} }
} }

50
src/j2se/org/luaj/lib/j2se/LuajavaLib.java
View File

@@ -65,6 +65,8 @@ public final class LuajavaLib extends LFunction {
"createProxy", "createProxy",
"loadLib" }; "loadLib" };
private static final Map classMetatables = new HashMap();
private int id; private int id;
private LuajavaLib( int id ) { private LuajavaLib( int id ) {
this.id = id; this.id = id;
@@ -83,7 +85,7 @@ public final class LuajavaLib extends LFunction {
try { try {
Class clazz = Class.forName(className); Class clazz = Class.forName(className);
vm.resettop(); vm.resettop();
vm.pushlvalue( new LInstance( clazz, clazz ) ); vm.pushlvalue( toUserdata( clazz, clazz ) );
} catch (Exception e) { } catch (Exception e) {
throw new LuaErrorException(e); throw new LuaErrorException(e);
} }
@@ -102,7 +104,7 @@ public final class LuajavaLib extends LFunction {
// set the result // set the result
vm.resettop(); vm.resettop();
vm.pushlvalue( new LInstance( o, clazz ) ); vm.pushlvalue( toUserdata( o, clazz ) );
} catch (Exception e) { } catch (Exception e) {
throw new LuaErrorException(e); throw new LuaErrorException(e);
@@ -123,7 +125,7 @@ public final class LuajavaLib extends LFunction {
values = new LValue[n]; values = new LValue[n];
classes = new Class[n]; classes = new Class[n];
for ( int i=0; i<n; i++ ) { for ( int i=0; i<n; i++ ) {
values[i] = vm.topointer(i+3); values[i] = vm.topointer(i-n);
classes[i] = values[i].getClass(); classes[i] = values[i].getClass();
hash += classes[i].hashCode(); hash += classes[i].hashCode();
} }
@@ -138,42 +140,46 @@ public final class LuajavaLib extends LFunction {
} }
} }
public static class LInstance extends LUserData { static LUserData toUserdata(final Object instance, final Class clazz) {
private Class clazz; LTable mt = (LTable) classMetatables.get(clazz);
public LInstance(Object o, Class clazz) { if ( mt == null ) {
super(o); mt = new LTable();
this.clazz = clazz; mt.put( LValue.TM_INDEX, new LFunction() {
} public boolean luaStackCall(LuaState vm) {
public LValue luaGetTable(LuaState vm, LValue table, LValue key) { LValue key = vm.topointer(3);
final String s = key.toJavaString(); final String s = key.toJavaString();
vm.resettop();
try { try {
Field f = clazz.getField(s); Field f = clazz.getField(s);
Object o = f.get(m_instance); Object o = f.get(instance);
return CoerceJavaToLua.coerce( o ); vm.pushlvalue( CoerceJavaToLua.coerce( o ) );
} catch (NoSuchFieldException nsfe) { } catch (NoSuchFieldException nsfe) {
return new LMethod(m_instance,clazz,s); vm.pushlvalue( new LMethod(instance,clazz,s) );
} catch (Exception e) { } catch (Exception e) {
throw new LuaErrorException(e); throw new LuaErrorException(e);
} }
return false;
} }
public void luaSetTable(LuaState vm, LValue table, LValue key, LValue val) { });
Class c = m_instance.getClass(); mt.put( LValue.TM_NEWINDEX, new LFunction() {
public boolean luaStackCall(LuaState vm) {
LValue key = vm.topointer(3);
LValue val = vm.topointer(4);
String s = key.toJavaString(); String s = key.toJavaString();
try { try {
Field f = c.getField(s); Field f = clazz.getField(s);
Object v = CoerceLuaToJava.coerceArg(val, f.getType()); Object v = CoerceLuaToJava.coerceArg(val, f.getType());
f.set(m_instance,v); f.set(instance,v);
vm.resettop(); vm.resettop();
} catch (Exception e) { } catch (Exception e) {
throw new LuaErrorException(e); throw new LuaErrorException(e);
} }
return false;
} }
});
public boolean luaStackCall(LuaState vm) { classMetatables.put(clazz, mt);
// TODO Auto-generated method stub
return super.luaStackCall(vm);
} }
return new LUserData(instance,mt);
} }
private static final class LMethod extends LFunction { private static final class LMethod extends LFunction {