Mercurial Hosting > luan
diff src/luan/interp/ConcatExpr.java @ 49:8ede219cd111
add WebShell
git-svn-id: https://luan-java.googlecode.com/svn/trunk@50 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Fri, 28 Dec 2012 19:35:04 +0000 |
| parents | 64ecb7a3aad7 |
| children | d6c454b7f58c |
line wrap: on
line diff
--- a/src/luan/interp/ConcatExpr.java Fri Dec 28 03:29:12 2012 +0000 +++ b/src/luan/interp/ConcatExpr.java Fri Dec 28 19:35:04 2012 +0000 @@ -12,17 +12,17 @@ super(se,op1,op2); } - @Override public Object eval(LuanStateImpl lua) throws LuanException { - Object o1 = op1.eval(lua); - Object o2 = op2.eval(lua); + @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); if( s1 != null && s2 != null ) return s1 + s2; - LuanFunction fn = lua.getBinHandler(se,"__concat",o1,o2); + LuanFunction fn = luan.getBinHandler(se,"__concat",o1,o2); if( fn != null ) - return Luan.first(lua.call(fn,se,"__concat",o1,o2)); + return Luan.first(luan.call(fn,se,"__concat",o1,o2)); String type = s1==null ? Luan.type(o1) : Luan.type(o2); - throw new LuanException( lua, se, "attempt to concatenate a " + type + " value" ); + throw new LuanException( luan, se, "attempt to concatenate a " + type + " value" ); } }