diff options
| author | mig <mig> | 2013-01-10 21:44:52 (GMT) |
|---|---|---|
| committer | mig <mig> | 2013-01-10 21:44:52 (GMT) |
| commit | 02d08377ecc92b44e6712f111f75697cfb836024 (patch) | |
| tree | eae97db8daf3ca95585002c8f86586b0008f25b5 /generic/tclEnsemble.c | |
| parent | bc7433a4ef2444aa066152597a2d1cad34d1ae2a (diff) | |
| parent | f8818287433bd77569f36a38ce44d447a315faf8 (diff) | |
| download | tcl-02d08377ecc92b44e6712f111f75697cfb836024.zip tcl-02d08377ecc92b44e6712f111f75697cfb836024.tar.gz tcl-02d08377ecc92b44e6712f111f75697cfb836024.tar.bz2 | |
merge mig-nre-mods
Diffstat (limited to 'generic/tclEnsemble.c')
| -rw-r--r-- | generic/tclEnsemble.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index d525fad..a1d2f1d 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -1885,7 +1885,7 @@ NsEnsembleImplementationCmdNR( 2 + ensemblePtr->numParameters; iPtr->ensembleRewrite.numInsertedObjs = prefixObjc + ensemblePtr->numParameters; - TclNRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, + Tcl_NRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, NULL); } else { register int ni = 2 + ensemblePtr->numParameters @@ -1904,7 +1904,7 @@ NsEnsembleImplementationCmdNR( * Hand off to the target command. */ - iPtr->evalFlags |= TCL_EVAL_REDIRECT; + TclDeferCallbacks(interp, /* skip tailcalls */ 1); return TclNREvalObjEx(interp, copyPtr, TCL_EVAL_INVOKE); } @@ -2112,7 +2112,7 @@ EnsembleUnknownCallback( */ Tcl_Preserve(ensemblePtr); - ((Interp *) interp)->evalFlags |= TCL_EVAL_REDIRECT; + TclDeferCallbacks (interp, /*skip tailcalls */ 1); result = Tcl_EvalObjv(interp, paramc, paramv, 0); if ((result == TCL_OK) && (ensemblePtr->flags & ENSEMBLE_DEAD)) { if (!Tcl_InterpDeleted(interp)) { |