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

Let shared metatable for array access work on multiple instances.

Browse Source
This commit is contained in:
James Roseborough
2009-10-24 03:29:52 +00:00
parent 9d22ef7855
commit 3c2413a88a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ public final class LuajavaLib extends LFunction {
private static LString LENGTH = LString.valueOf("length"); private static LString LENGTH = LString.valueOf("length");
static LUserData toUserdata(final Object instance, final Class clazz) { static LUserData toUserdata(Object obj, final Class clazz) {
LTable mt = (LTable) classMetatables.get(clazz); LTable mt = (LTable) classMetatables.get(clazz);
if ( mt == null ) { if ( mt == null ) {
mt = new LTable(); mt = new LTable();
@@ -229,6 +229,7 @@ public final class LuajavaLib extends LFunction {
public boolean luaStackCall(LuaState vm) { public boolean luaStackCall(LuaState vm) {
LValue table = vm.topointer(2); LValue table = vm.topointer(2);
LValue key = vm.topointer(3); LValue key = vm.topointer(3);
Object instance = table.toJavaInstance();
if ( key instanceof LInteger ) { if ( key instanceof LInteger ) {
if ( clazz.isArray() ) { if ( clazz.isArray() ) {
vm.resettop(); vm.resettop();
@@ -244,7 +245,7 @@ public final class LuajavaLib extends LFunction {
vm.resettop(); vm.resettop();
try { try {
Field f = clazz.getField(s); Field f = clazz.getField(s);
Object o = f.get(table.toJavaInstance()); Object o = f.get(instance);
vm.pushlvalue( CoerceJavaToLua.coerce( o ) ); vm.pushlvalue( CoerceJavaToLua.coerce( o ) );
} catch (NoSuchFieldException nsfe) { } catch (NoSuchFieldException nsfe) {
if ( clazz.isArray() && key.equals(LENGTH) ) { if ( clazz.isArray() && key.equals(LENGTH) ) {
@@ -263,6 +264,8 @@ public final class LuajavaLib extends LFunction {
LValue table = vm.topointer(2); LValue table = vm.topointer(2);
LValue key = vm.topointer(3); LValue key = vm.topointer(3);
LValue val = vm.topointer(4); LValue val = vm.topointer(4);
Object instance = table.toJavaInstance();
if ( key instanceof LInteger ) { if ( key instanceof LInteger ) {
if ( clazz.isArray() ) { if ( clazz.isArray() ) {
vm.resettop(); vm.resettop();
@@ -280,7 +283,7 @@ public final class LuajavaLib extends LFunction {
try { try {
Field f = clazz.getField(s); Field f = clazz.getField(s);
Object v = CoerceLuaToJava.coerceArg(val, f.getType()); Object v = CoerceLuaToJava.coerceArg(val, f.getType());
f.set(table.toJavaInstance(),v); f.set(instance,v);
vm.resettop(); vm.resettop();
} catch (Exception e) { } catch (Exception e) {
throw new LuaErrorException(e); throw new LuaErrorException(e);
@@ -290,7 +293,7 @@ public final class LuajavaLib extends LFunction {
}); });
classMetatables.put(clazz, mt); classMetatables.put(clazz, mt);
} }
return new LUserData(instance,mt); return new LUserData(obj,mt);
} }
private static final class LMethod extends LFunction { private static final class LMethod extends LFunction {