diff options
Diffstat (limited to 'generic/tclDictObj.c')
| -rw-r--r-- | generic/tclDictObj.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index e31d708..5f92701 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -2375,7 +2375,6 @@ DictForNRCmd( int objc, Tcl_Obj *const *objv) { - Interp *iPtr = (Interp *) interp; Tcl_Obj *scriptObj, *keyVarObj, *valueVarObj; Tcl_Obj **varv, *keyObj, *valueObj; Tcl_DictSearch *searchPtr; @@ -2445,7 +2444,7 @@ DictForNRCmd( TclNRAddCallback(interp, DictForLoopCallback, searchPtr, keyVarObj, valueVarObj, scriptObj); - return TclNREvalObjEx(interp, scriptObj, 0, iPtr->cmdFramePtr, 3); + return TclNREvalObjEx(interp, scriptObj, 0); /* * For unwinding everything on error. @@ -2466,7 +2465,6 @@ DictForLoopCallback( Tcl_Interp *interp, int result) { - Interp *iPtr = (Interp *) interp; Tcl_DictSearch *searchPtr = data[0]; Tcl_Obj *keyVarObj = data[1]; Tcl_Obj *valueVarObj = data[2]; @@ -2527,7 +2525,7 @@ DictForLoopCallback( TclNRAddCallback(interp, DictForLoopCallback, searchPtr, keyVarObj, valueVarObj, scriptObj); - return TclNREvalObjEx(interp, scriptObj, 0, iPtr->cmdFramePtr, 3); + return TclNREvalObjEx(interp, scriptObj, 0); /* * For unwinding everything once the iterating is done. @@ -2567,7 +2565,6 @@ DictMapNRCmd( int objc, Tcl_Obj *const *objv) { - Interp *iPtr = (Interp *) interp; Tcl_Obj **varv, *keyObj, *valueObj; DictMapStorage *storagePtr; int varc, done; @@ -2646,8 +2643,7 @@ DictMapNRCmd( */ TclNRAddCallback(interp, DictMapLoopCallback, storagePtr, NULL,NULL,NULL); - return TclNREvalObjEx(interp, storagePtr->scriptObj, 0, - iPtr->cmdFramePtr, 3); + return TclNREvalObjEx(interp, storagePtr->scriptObj, 0); /* * For unwinding everything on error. @@ -2669,7 +2665,6 @@ DictMapLoopCallback( Tcl_Interp *interp, int result) { - Interp *iPtr = (Interp *) interp; DictMapStorage *storagePtr = data[0]; Tcl_Obj *keyObj, *valueObj; int done; @@ -2736,8 +2731,7 @@ DictMapLoopCallback( */ TclNRAddCallback(interp, DictMapLoopCallback, storagePtr, NULL,NULL,NULL); - return TclNREvalObjEx(interp, storagePtr->scriptObj, 0, - iPtr->cmdFramePtr, 3); + return TclNREvalObjEx(interp, storagePtr->scriptObj, 0); /* * For unwinding everything once the iterating is done. @@ -2897,7 +2891,6 @@ DictFilterCmd( int objc, Tcl_Obj *const *objv) { - Interp *iPtr = (Interp *) interp; static const char *const filters[] = { "key", "script", "value", NULL }; @@ -3081,11 +3074,7 @@ DictFilterCmd( goto abnormalResult; } - /* - * TIP #280. Make invoking context available to loop body. - */ - - result = TclEvalObjEx(interp, scriptObj, 0, iPtr->cmdFramePtr, 4); + result = Tcl_EvalObjEx(interp, scriptObj, 0); switch (result) { case TCL_OK: boolObj = Tcl_GetObjResult(interp); @@ -3184,7 +3173,6 @@ DictUpdateCmd( int objc, Tcl_Obj *const *objv) { - Interp *iPtr = (Interp *) interp; Tcl_Obj *dictPtr, *objPtr; int i, dummy; @@ -3228,7 +3216,7 @@ DictUpdateCmd( Tcl_IncrRefCount(objv[1]); TclNRAddCallback(interp, FinalizeDictUpdate, objv[1], objPtr, NULL,NULL); - return TclNREvalObjEx(interp, objv[objc-1], 0, iPtr->cmdFramePtr, objc-1); + return TclNREvalObjEx(interp, objv[objc-1], 0); } static int @@ -3343,7 +3331,6 @@ DictWithCmd( int objc, Tcl_Obj *const *objv) { - Interp *iPtr = (Interp *) interp; Tcl_Obj *dictPtr, *keysPtr, *pathPtr; if (objc < 3) { @@ -3367,8 +3354,7 @@ DictWithCmd( Tcl_IncrRefCount(keysPtr); /* - * Execute the body, while making the invoking context available to the - * loop body (TIP#280) and postponing the cleanup until later (NRE). + * Execute the body, while postponing the cleanup until later (NRE). */ pathPtr = NULL; @@ -3380,7 +3366,7 @@ DictWithCmd( TclNRAddCallback(interp, FinalizeDictWith, objv[1], keysPtr, pathPtr, NULL); - return TclNREvalObjEx(interp, objv[objc-1], 0, iPtr->cmdFramePtr, objc-1); + return TclNREvalObjEx(interp, objv[objc-1], 0); } static int |