diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-12 21:24:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-12 21:24:14 (GMT) |
| commit | 3b079f137c6a1a8776a9696cbbac0ff4d4b9cedc (patch) | |
| tree | 448e0e818cab2430c5c59271e31123d787f132b2 /generic/tclDictObj.c | |
| parent | b2a28063811abb4c3bbe540d8e42b24c571b4588 (diff) | |
| download | tcl-3b079f137c6a1a8776a9696cbbac0ff4d4b9cedc.zip tcl-3b079f137c6a1a8776a9696cbbac0ff4d4b9cedc.tar.gz tcl-3b079f137c6a1a8776a9696cbbac0ff4d4b9cedc.tar.bz2 | |
Restore TclListObjGetElements()/TclListObjLength() as they were in 8.6 too.
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 7c56c49..43f003b 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -621,7 +621,7 @@ SetDictFromAny( Tcl_Obj **objv; /* Cannot fail, we already know the Tcl_ObjType is "list". */ - TclListObjGetElementsM(NULL, objPtr, &objc, &objv); + TclListObjGetElements(NULL, objPtr, &objc, &objv); if (objc & 1) { goto missingValue; } @@ -2509,7 +2509,7 @@ DictForNRCmd( * Parse arguments. */ - if (TclListObjGetElementsM(interp, objv[1], &varc, &varv) != TCL_OK) { + if (TclListObjGetElements(interp, objv[1], &varc, &varv) != TCL_OK) { return TCL_ERROR; } if (varc != 2) { @@ -2528,7 +2528,7 @@ DictForNRCmd( TclStackFree(interp, searchPtr); return TCL_OK; } - TclListObjGetElementsM(NULL, objv[1], &varc, &varv); + TclListObjGetElements(NULL, objv[1], &varc, &varv); keyVarObj = varv[0]; valueVarObj = varv[1]; scriptObj = objv[3]; @@ -2704,7 +2704,7 @@ DictMapNRCmd( * Parse arguments. */ - if (TclListObjGetElementsM(interp, objv[1], &varc, &varv) != TCL_OK) { + if (TclListObjGetElements(interp, objv[1], &varc, &varv) != TCL_OK) { return TCL_ERROR; } if (varc != 2) { @@ -2730,7 +2730,7 @@ DictMapNRCmd( return TCL_OK; } TclNewObj(storagePtr->accumulatorObj); - TclListObjGetElementsM(NULL, objv[1], &varc, &varv); + TclListObjGetElements(NULL, objv[1], &varc, &varv); storagePtr->keyVarObj = varv[0]; storagePtr->valueVarObj = varv[1]; storagePtr->scriptObj = objv[3]; @@ -3144,7 +3144,7 @@ DictFilterCmd( * copying from the "dict for" implementation has occurred! */ - if (TclListObjGetElementsM(interp, objv[3], &varc, &varv) != TCL_OK) { + if (TclListObjGetElements(interp, objv[3], &varc, &varv) != TCL_OK) { return TCL_ERROR; } if (varc != 2) { @@ -3406,7 +3406,7 @@ FinalizeDictUpdate( * an instruction to remove the key. */ - TclListObjGetElementsM(NULL, argsObj, &objc, &objv); + TclListObjGetElements(NULL, argsObj, &objc, &objv); for (i=0 ; i<objc ; i+=2) { objPtr = Tcl_ObjGetVar2(interp, objv[i+1], NULL, 0); if (objPtr == NULL) { @@ -3530,7 +3530,7 @@ FinalizeDictWith( state = Tcl_SaveInterpState(interp, result); if (pathPtr != NULL) { - TclListObjGetElementsM(NULL, pathPtr, &pathc, &pathv); + TclListObjGetElements(NULL, pathPtr, &pathc, &pathv); } else { pathc = 0; pathv = NULL; @@ -3736,7 +3736,7 @@ TclDictWithFinish( * Now process our updates on the leaf dictionary. */ - TclListObjGetElementsM(NULL, keysPtr, &keyc, &keyv); + TclListObjGetElements(NULL, keysPtr, &keyc, &keyv); for (i=0 ; i<keyc ; i++) { valPtr = Tcl_ObjGetVar2(interp, keyv[i], NULL, 0); if (valPtr == NULL) { |