diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-07-02 20:43:16 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-07-02 20:43:16 (GMT) |
| commit | 3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e (patch) | |
| tree | 2197fdfe935e76e4b8dd4b78ccd3a79b7320603d /generic/tclProc.c | |
| parent | 7add065e0f5720a2ee8d4d874931087e1ad246cc (diff) | |
| parent | 8e39be1340c8878cb33ac4c219acb88d3521a7a0 (diff) | |
| download | tcl-3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e.zip tcl-3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e.tar.gz tcl-3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclProc.c')
| -rw-r--r-- | generic/tclProc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c index ea60586..286754e 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -1124,12 +1124,10 @@ ProcWrongNumArgs( if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) { desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", -1); } else { - ((Interp *) interp)->ensembleRewrite.numInsertedObjs -= skip - 1; - #ifdef AVOID_HACKS_FOR_ITCL desiredObjs[0] = framePtr->objv[skip-1]; #else - desiredObjs[0] = Tcl_NewListObj(skip, framePtr->objv); + desiredObjs[0] = Tcl_NewListObj(1, framePtr->objv + skip - 1); #endif /* AVOID_HACKS_FOR_ITCL */ } Tcl_IncrRefCount(desiredObjs[0]); @@ -1568,6 +1566,10 @@ InitArgsAndLocals( */ incorrectArgs: + if ((skip != 1) && + TclInitRewriteEnsemble(interp, skip-1, 0, framePtr->objv)) { + TclNRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, NULL); + } memset(varPtr, 0, ((framePtr->compiledLocals + localCt)-varPtr) * sizeof(Var)); return ProcWrongNumArgs(interp, skip); @@ -2770,10 +2772,6 @@ TclNRApplyObjCmd( extraPtr->efi.fields[0].clientData = lambdaPtr; extraPtr->cmd.clientData = &extraPtr->efi; - if (TclInitRewriteEnsemble(interp, 1, 0, objv)) { - TclNRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, NULL); - } - result = TclPushProcCallFrame(procPtr, interp, objc, objv, 1); if (result == TCL_OK) { TclNRAddCallback(interp, ApplyNR2, extraPtr, NULL, NULL, NULL); |