diff core/src/luan/impl/EqExpr.java @ 191:2456ef7ada02

minor git-svn-id: https://luan-java.googlecode.com/svn/trunk@192 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Tue, 01 Jul 2014 06:40:48 +0000
parents 3dcb0f9bee82
children 17b02b56d806
line wrap: on
line diff
--- a/core/src/luan/impl/EqExpr.java	Thu Jun 26 18:20:54 2014 +0000
+++ b/core/src/luan/impl/EqExpr.java	Tue Jul 01 06:40:48 2014 +0000
@@ -15,6 +15,10 @@
 	}
 
 	@Override public Object eval(LuanStateImpl luan) throws LuanException {
+		return eq(luan);
+	}
+
+	private boolean eq(LuanStateImpl luan) throws LuanException {
 		Object o1 = op1.eval(luan);
 		Object o2 = op2.eval(luan);
 		if( o1 == o2 || o1 != null && o1.equals(o2) )
@@ -32,9 +36,13 @@
 			return false;
 		Object f = mt1.get("__eq");
 		if( f == null || !f.equals(mt2.get("__eq")) )
-			return null;
+			return false;
 		LuanBit bit = luan.bit(se);
 		LuanFunction fn = bit.checkFunction(f);
 		return Luan.toBoolean( Luan.first(bit.call(fn,"__eq",new Object[]{o1,o2})) );
 	}
+
+	@Override public String toString() {
+		return "(EqExpr "+op1+" "+op2+")";
+	}
 }