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

Improve compatibility with lua 5.2.

Browse Source
This commit is contained in:
James Roseborough
2012-09-20 05:30:41 +00:00
parent 4d8877e56b
commit 9ae6767f76
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/org/luaj/vm2/LuaValue.java
View File

@@ -2970,11 +2970,12 @@ public class LuaValue extends Varargs {
* @see #lteq(LuaValue) * @see #lteq(LuaValue)
*/ */
public LuaValue comparemt( LuaValue tag, LuaValue op1 ) { public LuaValue comparemt( LuaValue tag, LuaValue op1 ) {
if ( type() == op1.type() ) { LuaValue h = metatag(tag);
LuaValue h = metatag(tag); if ( !h.isnil() )
if ( !h.isnil() && h == op1.metatag(tag) ) return h.call(this, op1);
return h.call(this, op1); h = op1.metatag(tag);
} if ( !h.isnil() )
return h.call(this, op1);
return error("attempt to compare "+tag+" on "+typename()+" and "+op1.typename()); return error("attempt to compare "+tag+" on "+typename()+" and "+op1.typename());
} }

16
test/junit/org/luaj/vm2/UnaryBinaryOperatorsTest.java
View File

@@ -848,14 +848,14 @@ public class UnaryBinaryOperatorsTest extends TestCase {
assertEquals( fal, fal.lt(tru) ); assertEquals( fal, fal.lt(tru) );
assertEquals( tbl, tbl.lt(tbl2) ); assertEquals( tbl, tbl.lt(tbl2) );
assertEquals( tbl2, tbl2.lt(tbl) ); assertEquals( tbl2, tbl2.lt(tbl) );
try { tbl.lt(tbl3); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl, tbl.lt(tbl3) );
try { tbl3.lt(tbl); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl3, tbl3.lt(tbl) );
assertEquals( fal, tru.lteq(fal) ); assertEquals( fal, tru.lteq(fal) );
assertEquals( tru, fal.lteq(tru) ); assertEquals( tru, fal.lteq(tru) );
assertEquals( tbl2, tbl.lteq(tbl2) ); assertEquals( tbl2, tbl.lteq(tbl2) );
assertEquals( tbl, tbl2.lteq(tbl) ); assertEquals( tbl, tbl2.lteq(tbl) );
try { tbl.lteq(tbl3); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl3, tbl.lteq(tbl3) );
try { tbl3.lteq(tbl); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl, tbl3.lteq(tbl) );
// always use right argument // always use right argument
mt = LuaValue.tableOf( new LuaValue[] { mt = LuaValue.tableOf( new LuaValue[] {
@@ -868,14 +868,14 @@ public class UnaryBinaryOperatorsTest extends TestCase {
assertEquals( tru, fal.lt(tru) ); assertEquals( tru, fal.lt(tru) );
assertEquals( tbl2, tbl.lt(tbl2) ); assertEquals( tbl2, tbl.lt(tbl2) );
assertEquals( tbl, tbl2.lt(tbl) ); assertEquals( tbl, tbl2.lt(tbl) );
try { tbl.lt(tbl3); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl3, tbl.lt(tbl3) );
try { tbl3.lt(tbl); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl, tbl3.lt(tbl) );
assertEquals( tru, tru.lteq(fal) ); assertEquals( tru, tru.lteq(fal) );
assertEquals( fal, fal.lteq(tru) ); assertEquals( fal, fal.lteq(tru) );
assertEquals( tbl, tbl.lteq(tbl2) ); assertEquals( tbl, tbl.lteq(tbl2) );
assertEquals( tbl2, tbl2.lteq(tbl) ); assertEquals( tbl2, tbl2.lteq(tbl) );
try { tbl.lteq(tbl3); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl, tbl.lteq(tbl3) );
try { tbl3.lteq(tbl); fail("did not throw error"); } catch ( LuaError le ) { }; assertEquals( tbl3, tbl3.lteq(tbl) );
} finally { } finally {
LuaBoolean.s_metatable = null; LuaBoolean.s_metatable = null;