comparison core/src/luan/impl/OrExpr.java @ 443:bf5e62a9090c

remove toBoolean() and to_boolean()
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 04 May 2015 14:55:51 -0600
parents 3dcb0f9bee82
children b48cfa14ba60
comparison
equal deleted inserted replaced
442:75ccb4da803f 443:bf5e62a9090c
11 super(se,op1,op2); 11 super(se,op1,op2);
12 } 12 }
13 13
14 @Override public Object eval(LuanStateImpl luan) throws LuanException { 14 @Override public Object eval(LuanStateImpl luan) throws LuanException {
15 Object v1 = op1.eval(luan); 15 Object v1 = op1.eval(luan);
16 return Luan.toBoolean(v1) ? v1 : op2.eval(luan); 16 return v1 != null && !Boolean.FALSE.equals(v1) ? v1 : op2.eval(luan);
17 } 17 }
18 } 18 }