summaryrefslogtreecommitdiffstats
path: root/generic/tclListObj.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-03-07 21:41:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-03-07 21:41:00 (GMT)
commitcb242c0d50a43eddaa567d50717b5367658eb934 (patch)
tree7301cf3c01f19becb0aaae1675df05aa05d9e760 /generic/tclListObj.c
parent24c4a4cc6ec7996c63ac3acf01ea9d6909941c87 (diff)
parentb4d6691add28bb5928fd51cf76bf7f6d9c78f5cc (diff)
downloadtcl-cb242c0d50a43eddaa567d50717b5367658eb934.zip
tcl-cb242c0d50a43eddaa567d50717b5367658eb934.tar.gz
tcl-cb242c0d50a43eddaa567d50717b5367658eb934.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclListObj.c')
-rw-r--r--generic/tclListObj.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 25e775c..608e2b5 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1141,17 +1141,11 @@ TclLindexList(
return TclLindexFlat(interp, listPtr, 1, &argPtr);
}
- if (indexListCopy->typePtr == &tclListType) {
- List *listRepPtr = ListRepPtr(indexListCopy);
+ {
+ int indexCount = -1; /* Size of the array of list indices. */
+ Tcl_Obj **indices = NULL; /* Array of list indices. */
- listPtr = TclLindexFlat(interp, listPtr, listRepPtr->elemCount,
- &listRepPtr->elements);
- } else {
- int indexCount = -1; /* Size of the array of list indices. */
- Tcl_Obj **indices = NULL;
- /* Array of list indices. */
-
- Tcl_ListObjGetElements(NULL, indexListCopy, &indexCount, &indices);
+ TclListObjGetElements(NULL, indexListCopy, &indexCount, &indices);
listPtr = TclLindexFlat(interp, listPtr, indexCount, indices);
}
Tcl_DecrRefCount(indexListCopy);