diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-16 19:43:32 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-16 19:43:32 (GMT) |
commit | 00f134d99d29092b3e42776297c8facaa29efcab (patch) | |
tree | c7e3c192a6060cf02467ad4ce68a79ad34d015ae /generic/tclCmdIL.c | |
parent | 1b13dffa8c63561730b6a741f9563dbea9f4acc8 (diff) | |
download | tcl-00f134d99d29092b3e42776297c8facaa29efcab.zip tcl-00f134d99d29092b3e42776297c8facaa29efcab.tar.gz tcl-00f134d99d29092b3e42776297c8facaa29efcab.tar.bz2 |
More TIP #502 optimizations and improvements, preparing further for the road to Tcl 9.
No longer use INT_MAX for TCL_INDEX_AFTER, because INT_MAX can be a normal index in Tcl 9.
TclGetIntForIndex now clips between -1 and INT_MAX. In Tcl 9 size_t will be used for the index data type.
Diffstat (limited to 'generic/tclCmdIL.c')
-rw-r--r-- | generic/tclCmdIL.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 03867b2..34e9382 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -3239,11 +3239,11 @@ Tcl_LsearchObjCmd( for (j=0 ; j<sortInfo.indexc ; j++) { int encoded = 0; - if (TclIndexEncode(interp, indices[j], TCL_INDEX_BEFORE, - TCL_INDEX_BEFORE, &encoded) != TCL_OK) { + if (TclIndexEncode(interp, indices[j], TCL_INDEX_NONE, + TCL_INDEX_NONE, &encoded) != TCL_OK) { result = TCL_ERROR; } - if (encoded == TCL_INDEX_BEFORE) { + if (encoded == TCL_INDEX_NONE) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "index \"%s\" cannot select an element " "from any list", Tcl_GetString(indices[j]))); @@ -3958,9 +3958,9 @@ Tcl_LsortObjCmd( for (j=0 ; j<indexc ; j++) { int encoded = 0; int result = TclIndexEncode(interp, indexv[j], - TCL_INDEX_BEFORE, TCL_INDEX_BEFORE, &encoded); + TCL_INDEX_NONE, TCL_INDEX_NONE, &encoded); - if ((result == TCL_OK) && (encoded == TCL_INDEX_BEFORE)) { + if ((result == TCL_OK) && (encoded == TCL_INDEX_NONE)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "index \"%s\" cannot select an element " "from any list", Tcl_GetString(indexv[j]))); @@ -4049,8 +4049,8 @@ Tcl_LsortObjCmd( } for (j=0 ; j<sortInfo.indexc ; j++) { /* Prescreened values, no errors or out of range possible */ - TclIndexEncode(NULL, indexv[j], TCL_INDEX_BEFORE, - TCL_INDEX_BEFORE, &sortInfo.indexv[j]); + TclIndexEncode(NULL, indexv[j], TCL_INDEX_NONE, + TCL_INDEX_NONE, &sortInfo.indexv[j]); } } |