diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-08-23 12:04:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-08-23 12:04:12 (GMT) |
| commit | 867455ff8cc351d86dce809686094b62f6a86c59 (patch) | |
| tree | b80ed87109468f03e0fb1e0051354b2b8a1bd0a0 | |
| parent | 58fe468f9ace02f67157f1ee4679e013e75ea8e7 (diff) | |
| parent | c3b526dd8620621345e9c5ff0f72234cff838715 (diff) | |
| download | tcl-867455ff8cc351d86dce809686094b62f6a86c59.zip tcl-867455ff8cc351d86dce809686094b62f6a86c59.tar.gz tcl-867455ff8cc351d86dce809686094b62f6a86c59.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclBasic.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index b76bcd4..c90a5e2 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -4097,8 +4097,6 @@ TclNREvalObjv( Interp *iPtr = (Interp *) interp; int result; Namespace *lookupNsPtr = iPtr->lookupNsPtr; - Command **cmdPtrPtr; - NRE_callback *callbackPtr; int weLookUp = (cmdPtr == NULL); iPtr->lookupNsPtr = NULL; @@ -4114,13 +4112,10 @@ TclNREvalObjv( */ if (iPtr->deferredCallbacks) { - callbackPtr = iPtr->deferredCallbacks; iPtr->deferredCallbacks = NULL; } else { TclNRAddCallback(interp, NRCommand, NULL, NULL, NULL, NULL); - callbackPtr = TOP_CB(interp); } - cmdPtrPtr = (Command **) &(callbackPtr->data[0]); iPtr->numLevels++; result = TclInterpReady(interp); @@ -4203,14 +4198,6 @@ TclNREvalObjv( } } - /* - * Fix the original callback to point to the now known cmdPtr. Insure that - * the Command struct lives until the command returns. - */ - - *cmdPtrPtr = cmdPtr; - cmdPtr->refCount++; - TclNRAddCallback(interp, Dispatch, cmdPtr->nreProc ? cmdPtr->nreProc : cmdPtr->objProc, cmdPtr->objClientData, INT2PTR(objc), objv); @@ -4304,13 +4291,8 @@ NRCommand( int result) { Interp *iPtr = (Interp *) interp; - Command *cmdPtr = data[0]; - /* int cmdStart = PTR2INT(data[1]); NOT USED HERE */ - if (cmdPtr) { - TclCleanupCommandMacro(cmdPtr); - } - ((Interp *)interp)->numLevels--; + iPtr->numLevels--; /* * If there is a tailcall, schedule it |