From d70ed23d1dd13a49c2fff627c2f0a4741a0410fa Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Sat, 21 Aug 2010 14:38:01 +0000 Subject: [PATCH] Improve equality comparison --- src/core/org/luaj/vm2/LuaTable.java | 2 +- src/core/org/luaj/vm2/LuaUserdata.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/org/luaj/vm2/LuaTable.java b/src/core/org/luaj/vm2/LuaTable.java index 154bf7be..fe1e294d 100644 --- a/src/core/org/luaj/vm2/LuaTable.java +++ b/src/core/org/luaj/vm2/LuaTable.java @@ -296,7 +296,7 @@ public class LuaTable extends LuaValue { } public boolean eq_b( LuaTable val ) { - return this == val || val.eqmt_b(this); + return this == val || (m_metatable!=null && val.eqmt_b(this)); } public int maxn() { diff --git a/src/core/org/luaj/vm2/LuaUserdata.java b/src/core/org/luaj/vm2/LuaUserdata.java index 8df3245b..9f07ff37 100644 --- a/src/core/org/luaj/vm2/LuaUserdata.java +++ b/src/core/org/luaj/vm2/LuaUserdata.java @@ -113,6 +113,6 @@ public class LuaUserdata extends LuaValue { } public boolean eq_b( LuaUserdata val ) { - return this == val || m_instance.equals(val.m_instance) || val.eqmt_b(this); + return this == val || m_instance.equals(val.m_instance) || (m_metatable!=null && val.eqmt_b(this)); } }