diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2009-12-09 17:55:00 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2009-12-09 17:55:00 (GMT) |
| commit | e699453c93c0d61c1571e533dd550088858bd10f (patch) | |
| tree | 60dc975989dfb52bbb5f88537ac8cd427a8e4d6c /generic/tclBasic.c | |
| parent | 284f9241b726a8693f5915c2e37abac122cc1a8a (diff) | |
| download | tcl-e699453c93c0d61c1571e533dd550088858bd10f.zip tcl-e699453c93c0d61c1571e533dd550088858bd10f.tar.gz tcl-e699453c93c0d61c1571e533dd550088858bd10f.tar.bz2 | |
* generic/tclBasic.c: Insure correct lifetime of varFrame's
(objc,objv)for coroutines.
* generic/tclExecute.c: Code regrouping
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 9839935..d427a3a 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.422 2009/12/09 16:41:19 dkf Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.423 2009/12/09 17:55:01 msofer Exp $ */ #include "tclInt.h" @@ -8651,8 +8651,9 @@ NRCoroutineExitCallback( int result) { CoroutineData *corPtr = data[0]; + Tcl_Obj *arglistPtr = data[1]; Command *cmdPtr = corPtr->cmdPtr; - + /* * This runs at the bottom of the Coroutine's execEnv: it will be executed * when the coroutine returns or is wound down, but not when it yields. It @@ -8667,7 +8668,8 @@ NRCoroutineExitCallback( NRE_ASSERT(iPtr->framePtr->compiledLocals == NULL); TclPopStackFrame(interp); - + Tcl_DecrRefCount(arglistPtr); + cmdPtr->deleteProc = NULL; Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr); TclCleanupCommandMacro(cmdPtr); @@ -8768,7 +8770,8 @@ TclNRCoroutineObjCmd( const char *procName; Namespace *nsPtr, *altNsPtr, *cxtNsPtr; Tcl_DString ds; - + Tcl_Obj *arglistPtr; + if (objc < 3) { Tcl_WrongNumArgs(interp, 1, objv, "name cmd ?arg ...?"); return TCL_ERROR; @@ -8853,8 +8856,12 @@ TclNRCoroutineObjCmd( ckfree((char *) corPtr); return TCL_ERROR; } - framePtr->objc = objc-2; - framePtr->objv = &objv[2]; + arglistPtr = Tcl_NewListObj(objc-2, &objv[2]); + Tcl_IncrRefCount(arglistPtr); + Tcl_ListObjGetElements(interp, arglistPtr, &framePtr->objc, + &framePtr->objv); + //framePtr->objc = objc-2; + //framePtr->objv = &objv[2]; /* * Save the base context. The base cmdFramePtr is unknown at this time: it @@ -8920,7 +8927,8 @@ TclNRCoroutineObjCmd( iPtr->lookupNsPtr = iPtr->framePtr->nsPtr; corPtr->auxNumLevels = iPtr->numLevels; - TclNRAddCallback(interp, NRCoroutineExitCallback, corPtr, NULL,NULL,NULL); + TclNRAddCallback(interp, NRCoroutineExitCallback, corPtr, arglistPtr, + NULL,NULL); iPtr->evalFlags |= TCL_EVAL_REDIRECT; TclNREvalObjEx(interp, cmdObjPtr, 0, NULL, 0); |