diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 12:50:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 12:50:28 (GMT) |
| commit | b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441 (patch) | |
| tree | 320c57b53c7d114fe3b77003877d1e5d297ec3f4 /generic/tclDictObj.c | |
| parent | 2c603a6a0f21a7c2eadaad5c05dde221d46699c0 (diff) | |
| parent | af999a3a2c4770f8654059f5c5b50d766cc88c7f (diff) | |
| download | tcl-b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441.zip tcl-b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441.tar.gz tcl-b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclDictObj.c')
| -rw-r--r-- | generic/tclDictObj.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index e48aec2..c795030 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -616,7 +616,7 @@ SetDictFromAny( Tcl_Obj **objv; /* Cannot fail, we already know the Tcl_ObjType is "list". */ - TclListObjGetElements(NULL, objPtr, &objc, &objv); + TclListObjGetElementsM(NULL, objPtr, &objc, &objv); if (objc & 1) { goto missingValue; } @@ -2481,7 +2481,7 @@ DictForNRCmd( * Parse arguments. */ - if (TclListObjGetElements(interp, objv[1], &varc, &varv) != TCL_OK) { + if (TclListObjGetElementsM(interp, objv[1], &varc, &varv) != TCL_OK) { return TCL_ERROR; } if (varc != 2) { @@ -2500,7 +2500,7 @@ DictForNRCmd( TclStackFree(interp, searchPtr); return TCL_OK; } - TclListObjGetElements(NULL, objv[1], &varc, &varv); + TclListObjGetElementsM(NULL, objv[1], &varc, &varv); keyVarObj = varv[0]; valueVarObj = varv[1]; scriptObj = objv[3]; @@ -2675,7 +2675,7 @@ DictMapNRCmd( * Parse arguments. */ - if (TclListObjGetElements(interp, objv[1], &varc, &varv) != TCL_OK) { + if (TclListObjGetElementsM(interp, objv[1], &varc, &varv) != TCL_OK) { return TCL_ERROR; } if (varc != 2) { @@ -2701,7 +2701,7 @@ DictMapNRCmd( return TCL_OK; } TclNewObj(storagePtr->accumulatorObj); - TclListObjGetElements(NULL, objv[1], &varc, &varv); + TclListObjGetElementsM(NULL, objv[1], &varc, &varv); storagePtr->keyVarObj = varv[0]; storagePtr->valueVarObj = varv[1]; storagePtr->scriptObj = objv[3]; @@ -3114,7 +3114,7 @@ DictFilterCmd( * copying from the "dict for" implementation has occurred! */ - if (TclListObjGetElements(interp, objv[3], &varc, &varv) != TCL_OK) { + if (TclListObjGetElementsM(interp, objv[3], &varc, &varv) != TCL_OK) { return TCL_ERROR; } if (varc != 2) { @@ -3375,7 +3375,7 @@ FinalizeDictUpdate( * an instruction to remove the key. */ - TclListObjGetElements(NULL, argsObj, &objc, &objv); + TclListObjGetElementsM(NULL, argsObj, &objc, &objv); for (i=0 ; i<objc ; i+=2) { objPtr = Tcl_ObjGetVar2(interp, objv[i+1], NULL, 0); if (objPtr == NULL) { @@ -3499,7 +3499,7 @@ FinalizeDictWith( state = Tcl_SaveInterpState(interp, result); if (pathPtr != NULL) { - TclListObjGetElements(NULL, pathPtr, &pathc, &pathv); + TclListObjGetElementsM(NULL, pathPtr, &pathc, &pathv); } else { pathc = 0; pathv = NULL; @@ -3705,7 +3705,7 @@ TclDictWithFinish( * Now process our updates on the leaf dictionary. */ - TclListObjGetElements(NULL, keysPtr, &keyc, &keyv); + TclListObjGetElementsM(NULL, keysPtr, &keyc, &keyv); for (i=0 ; i<keyc ; i++) { valPtr = Tcl_ObjGetVar2(interp, keyv[i], NULL, 0); if (valPtr == NULL) { |