Mercurial Hosting > luan
diff src/luan/LuaClosure.java @ 22:1e37f22a34c8
proper tail calls
git-svn-id: https://luan-java.googlecode.com/svn/trunk@23 21e917c8-12df-6dd8-5cb6-c86387c605b9
author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
---|---|
date | Wed, 05 Dec 2012 09:03:50 +0000 |
parents | c93d8c781853 |
children | 7ee247560db5 |
line wrap: on
line diff
--- a/src/luan/LuaClosure.java Tue Dec 04 09:16:03 2012 +0000 +++ b/src/luan/LuaClosure.java Wed Dec 05 09:03:50 2012 +0000 @@ -12,18 +12,28 @@ } public Object[] call(LuaState lua,Object... args) throws LuaException { - Object[] stack = lua.newStack(chunk.stackSize); - final int n = Math.min(args.length,chunk.numArgs); - for( int i=0; i<n; i++ ) { - stack[i] = args[i]; + Chunk chunk = this.chunk; + while(true) { + Object[] stack = lua.newStack(chunk.stackSize); + final int n = Math.min(args.length,chunk.numArgs); + for( int i=0; i<n; i++ ) { + stack[i] = args[i]; + } + Object[] returnValues; + LuaClosure tailFn; + try { + chunk.block.eval(lua); + } catch(ReturnException e) { + } finally { + returnValues = lua.returnValues; + tailFn = lua.tailFn; + lua.popStack(); + } + if( tailFn == null ) + return returnValues; + chunk = tailFn.chunk; + args = returnValues; } - try { - chunk.block.eval(lua); - } catch(ReturnException e) { - } finally { - lua.popStack(); - } - return lua.returnValues; } }