apply: handle the JIM_RETURN return code

The fix for tailcall in 0d5a208e92 meant that a JIM_RETURN return
code from apply was no longer being converted to the appropriate
return code.o

Fixes: #157

Signed-off-by: Steve Bennett <steveb@workware.net.au>

1 files changed, 15 insertions, 15 deletions

diff --git a/jim.c b/jim.c
index 6e0cdb7..4bd8576 100644
--- a/jim.c
+++ b/jim.c
@@ -10110,21 +10110,6 @@ tailcall:
     Jim_SetEmptyResult(interp);
     if (cmdPtr->isproc) {
         retcode = JimCallProcedure(interp, cmdPtr, objc, objv);
-
-        /* Handle the JIM_RETURN return code */
-        if (retcode == JIM_RETURN) {
-            if (--interp->returnLevel <= 0) {
-                retcode = interp->returnCode;
-                interp->returnCode = JIM_OK;
-                interp->returnLevel = 0;
-            }
-        }
-        else if (retcode == JIM_ERR) {
-            interp->addStackTrace++;
-            Jim_DecrRefCount(interp, interp->errorProc);
-            interp->errorProc = objv[0];
-            Jim_IncrRefCount(interp->errorProc);
-        }
     }
     else {
         interp->cmdPrivData = cmdPtr->u.native.privData;
@@ -10873,6 +10858,21 @@ badargset:
     interp->framePtr = interp->framePtr->parent;
     JimFreeCallFrame(interp, callFramePtr, JIM_FCF_REUSE);
 
+    /* Handle the JIM_RETURN return code */
+    if (retcode == JIM_RETURN) {
+        if (--interp->returnLevel <= 0) {
+            retcode = interp->returnCode;
+            interp->returnCode = JIM_OK;
+            interp->returnLevel = 0;
+        }
+    }
+    else if (retcode == JIM_ERR) {
+        interp->addStackTrace++;
+        Jim_DecrRefCount(interp, interp->errorProc);
+        interp->errorProc = argv[0];
+        Jim_IncrRefCount(interp->errorProc);
+    }
+
     return retcode;
 }