Mercurial Hosting > luan

comparison src/luan/interp/ConcatExpr.java @ 10:8217d8485715

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix string conversion git-svn-id: https://luan-java.googlecode.com/svn/trunk@11 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Thu, 22 Nov 2012 04:37:10 +0000
parents 8896068e0a4b
children b7d7069fee58
comparison
equal deleted inserted replaced
9:600676034a1a 10:8217d8485715
11 ConcatExpr(Expr op1,Expr op2) { 11 ConcatExpr(Expr op1,Expr op2) {
12 super(op1,op2); 12 super(op1,op2);
13 } 13 }
14 14
15 @Override Object eval(LuaState lua) throws LuaException { 15 @Override Object eval(LuaState lua) throws LuaException {
16 Object v1 = op1.eval(lua); 16 return toString(op1.eval(lua)) + toString(op2.eval(lua));
17 Object v2 = op2.eval(lua);
18 check(v1);
19 check(v2);
20 return Lua.toString(v1) + Lua.toString(v2);
21 } 17 }
22 18
23 private static void check(Object v) throws LuaException { 19 private static String toString(Object v) throws LuaException {
24 if( !(v instanceof String || v instanceof LuaNumber) ) 20 String s = Lua.asString(v);
21 if( s==null )
25 throw new LuaException( "attempt to concatenate a " + Lua.type(v) + " value" ); 22 throw new LuaException( "attempt to concatenate a " + Lua.type(v) + " value" );
23 return s;
26 } 24 }
27 } 25 }