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

Improve weak table implementation.

Browse Source
This commit is contained in:
James Roseborough
2010-07-07 15:35:27 +00:00
parent a5dc0eaa61
commit 400fd91482
1 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/core/org/luaj/vm2/WeakTable.java
View File

@@ -107,26 +107,34 @@ public class WeakTable extends LuaTable {
public LuaValue rawget( int key ) { public LuaValue rawget( int key ) {
LuaValue v = super.rawget(key).strongvalue(); return super.rawget(key).strongvalue();
if ( v.isnil() )
super.rawset(key, NIL);
return v;
} }
public LuaValue rawget( LuaValue key ) { public LuaValue rawget( LuaValue key ) {
LuaValue v = super.rawget(key).strongvalue(); return super.rawget(key).strongvalue();
if ( v.isnil() )
super.rawset(key, NIL);
return v;
} }
protected LuaValue hashget(LuaValue key) {
if ( hashEntries > 0 ) {
int i = hashFindSlot(key);
if ( hashEntries == 0 )
return NIL;
LuaValue v = hashValues[i];
return v!=null? v: NIL;
}
return NIL;
}
// override to remove values for weak keys as we search // override to remove values for weak keys as we search
public int hashFindSlot(LuaValue key) { public int hashFindSlot(LuaValue key) {
int i = ( key.hashCode() & 0x7FFFFFFF ) % hashKeys.length; int i = ( key.hashCode() & 0x7FFFFFFF ) % hashKeys.length;
LuaValue k; LuaValue k;
while ( i<hashKeys.length && ( k = hashKeys[i] ) != null ) { while ( ( k = hashKeys[i] ) != null ) {
if ( k.isnil() ) { if ( k.isweaknil() ) {
hashClearSlot(i); hashClearSlot(i);
if ( hashEntries == 0 )
return 0;
} }
else { else {
if ( k.eq_b(key) ) if ( k.eq_b(key) )
@@ -203,11 +211,6 @@ public class WeakTable extends LuaTable {
return "weak<"+ref.get()+">"; return "weak<"+ref.get()+">";
} }
public LuaValue strongkey() {
Object o = ref.get();
return o!=null? (LuaValue)o: NIL;
}
public LuaValue strongvalue() { public LuaValue strongvalue() {
Object o = ref.get(); Object o = ref.get();
return o!=null? (LuaValue)o: NIL; return o!=null? (LuaValue)o: NIL;
@@ -218,7 +221,7 @@ public class WeakTable extends LuaTable {
return o!=null && rhs.eq_b((LuaValue)o); return o!=null && rhs.eq_b((LuaValue)o);
} }
public boolean isnil() { public boolean isweaknil() {
return ref.get() == null; return ref.get() == null;
} }
} }
@@ -242,18 +245,15 @@ public class WeakTable extends LuaTable {
} }
public boolean eq_b(LuaValue rhs) { public boolean eq_b(LuaValue rhs) {
return rhs.isuserdata() && (rhs.touserdata() == ob.get()); if ( ! rhs.isuserdata() )
return false;
LuaValue v = (LuaValue) ref.get();
if ( v != null && v.eq_b(rhs) )
return true;
return rhs.touserdata() == ob.get();
} }
public boolean isuserdata() { public boolean isweaknil() {
return true;
}
public Object touserdata() {
return ob.get();
}
public boolean isnil() {
return ob.get() == null || ref.get() == null; return ob.get() == null || ref.get() == null;
} }
} }
@@ -269,14 +269,18 @@ public class WeakTable extends LuaTable {
this.weakvalue = weakvalue; this.weakvalue = weakvalue;
} }
public LuaValue strongkey() {
return weakkey.strongvalue();
}
// when looking up the value, look in the keys metatable
public LuaValue strongvalue() { public LuaValue strongvalue() {
LuaValue key = weakkey.strongkey(); LuaValue key = weakkey.strongvalue();
if ( key.isnil() ) if ( key.isnil() )
return weakvalue = NIL; return weakvalue = NIL;
return weakvalue.strongvalue(); return weakvalue.strongvalue();
} }
public int type() { public int type() {
illegal("type","weak entry"); illegal("type","weak entry");
return 0; return 0;
@@ -288,7 +292,7 @@ public class WeakTable extends LuaTable {
} }
public String toString() { public String toString() {
return "weak<"+strongkey()+","+strongvalue()+">"; return "weak<"+weakkey.strongvalue()+","+strongvalue()+">";
} }
public int hashCode() { public int hashCode() {
@@ -296,11 +300,12 @@ public class WeakTable extends LuaTable {
} }
public boolean eq_b(LuaValue rhs) { public boolean eq_b(LuaValue rhs) {
return rhs.eq_b(weakkey.strongkey()); //return rhs.eq_b(weakkey.strongvalue());
return weakkey.eq_b(rhs);
} }
public boolean isnil() { public boolean isweaknil() {
return weakkey.isnil() || weakvalue.isnil(); return weakkey.isweaknil() || weakvalue.isweaknil();
} }
} }
} }