Mercurial Hosting > luan
diff src/luan/interp/ConcatExpr.java @ 58:d6c454b7f58c
make concat work with any type;
improve JavaLib.getMembers();
git-svn-id: https://luan-java.googlecode.com/svn/trunk@59 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Mon, 07 Jan 2013 00:18:35 +0000 |
| parents | 8ede219cd111 |
| children | 6ca02b188dba |
line wrap: on
line diff
--- a/src/luan/interp/ConcatExpr.java Sun Jan 06 19:17:56 2013 +0000 +++ b/src/luan/interp/ConcatExpr.java Mon Jan 07 00:18:35 2013 +0000 @@ -15,8 +15,9 @@ @Override public Object eval(LuanStateImpl luan) throws LuanException { Object o1 = op1.eval(luan); Object o2 = op2.eval(luan); - String s1 = Luan.asString(o1); - String s2 = Luan.asString(o2); + String s1 = luan.toString(op1.se(),o1); + String s2 = luan.toString(op2.se(),o2); +/* if( s1 != null && s2 != null ) return s1 + s2; LuanFunction fn = luan.getBinHandler(se,"__concat",o1,o2); @@ -24,5 +25,7 @@ return Luan.first(luan.call(fn,se,"__concat",o1,o2)); String type = s1==null ? Luan.type(o1) : Luan.type(o2); throw new LuanException( luan, se, "attempt to concatenate a " + type + " value" ); +*/ + return s1 + s2; } }