summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2014-01-22 19:33:03 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2014-01-22 19:33:03 (GMT)
commitf0ea3870f02d9739dbfd2542e29cc62d96b9bea0 (patch)
tree04b0ea5cbeac269f069831b264bb0d982ad5a2ec
parentaf12cb795cc641b109098cdfd27781cd52b39dc9 (diff)
parentd9baccba96b82b4770d2bcb4ab9e6c18eb8c0bf7 (diff)
downloadtcl-f0ea3870f02d9739dbfd2542e29cc62d96b9bea0.zip
tcl-f0ea3870f02d9739dbfd2542e29cc62d96b9bea0.tar.gz
tcl-f0ea3870f02d9739dbfd2542e29cc62d96b9bea0.tar.bz2
improved tidy-up from branch
-rw-r--r--generic/tclBasic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 1aea752..46b532b 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -8416,7 +8416,7 @@ TclNRYieldToObjCmd(
{
CoroutineData *corPtr = iPtr->execEnvPtr->corPtr;
Tcl_Obj *listPtr, *nsObjPtr;
- Tcl_Namespace *nsPtr = (Tcl_Namespace *) iPtr->varFramePtr->nsPtr;
+ Tcl_Namespace *nsPtr = TclGetCurrentNamespace(interp);
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "command ?arg ...?");
@@ -8430,7 +8430,7 @@ TclNRYieldToObjCmd(
return TCL_ERROR;
}
- if (((Namespace *) TclGetCurrentNamespace(interp))->flags & NS_DYING) {
+ if (((Namespace *) nsPtr)->flags & NS_DYING) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"yieldto called in deleted namespace", -1));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "YIELDTO_IN_DELETED",