--- a/src/luan/interp/ReturnStmt.java	Tue Dec 04 09:16:03 2012 +0000
+++ b/src/luan/interp/ReturnStmt.java	Wed Dec 05 09:03:50 2012 +0000
@@ -1,19 +1,38 @@
 package luan.interp;
 
+import luan.Lua;
 import luan.LuaState;
 import luan.LuaException;
+import luan.LuaFunction;
+import luan.LuaClosure;
 
 
 final class ReturnStmt implements Stmt {
 	private final Expressions expressions;
+	private final Expr tailFnExpr;
 	boolean throwReturnException = true;
 
 	ReturnStmt(Expressions expressions) {
-		this.expressions = expressions;
+		if( expressions instanceof FnCall ) {  // tail call
+			FnCall fnCall = (FnCall)expressions;
+			this.expressions = fnCall.args;
+			this.tailFnExpr = fnCall.fnExpr;
+		} else {
+			this.expressions = expressions;
+			this.tailFnExpr = null;
+		}
 	}
 
 	@Override public void eval(LuaState lua) throws LuaException {
 		lua.returnValues = expressions.eval(lua);
+		if( tailFnExpr != null ) {
+			LuaFunction tailFn = Lua.checkFunction( tailFnExpr.eval(lua) );
+			if( tailFn instanceof LuaClosure ) {
+				lua.tailFn = (LuaClosure)tailFn;
+			} else {
+				lua.returnValues =  tailFn.call(lua,lua.returnValues);
+			}
+		}
 		if( throwReturnException )
 			throw new ReturnException();
 	}