diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-30 12:16:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-30 12:16:37 (GMT) |
| commit | 442a57b4bfdc8e30c31dbd98239c508ce8ca364f (patch) | |
| tree | 61b6d3d16351287a038b3a9a5baed7786b1e17a9 | |
| parent | 25e25d20899c6fbc934306b75990d290221d5669 (diff) | |
| parent | b1a8dc460f2e7f8a7ff436f52729f729ead3b92d (diff) | |
| download | tcl-442a57b4bfdc8e30c31dbd98239c508ce8ca364f.zip tcl-442a57b4bfdc8e30c31dbd98239c508ce8ca364f.tar.gz tcl-442a57b4bfdc8e30c31dbd98239c508ce8ca364f.tar.bz2 | |
Merge 9.0
| -rw-r--r-- | generic/tclStringObj.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index b5c6520..510907f 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -747,9 +747,6 @@ Tcl_GetRange( if (first == TCL_INDEX_NONE) { first = TCL_INDEX_START; } - if (last + 2 <= first + 1) { - return Tcl_NewObj(); - } /* * Optimize the case where we're really dealing with a bytearray object @@ -762,7 +759,7 @@ Tcl_GetRange( if (last >= length) { last = length - 1; } - if (last < first) { + if (last + 1 < first + 1) { TclNewObj(newObjPtr); return newObjPtr; } @@ -788,7 +785,7 @@ Tcl_GetRange( if (last >= stringPtr->numChars) { last = stringPtr->numChars - 1; } - if (last < first) { + if (last + 1 < first + 1) { TclNewObj(newObjPtr); return newObjPtr; } @@ -809,7 +806,7 @@ Tcl_GetRange( if (last >= stringPtr->numChars) { last = stringPtr->numChars - 1; } - if (last < first) { + if (last + 1 < first + 1) { TclNewObj(newObjPtr); return newObjPtr; } @@ -840,9 +837,6 @@ TclGetRange( if (first == TCL_INDEX_NONE) { first = TCL_INDEX_START; } - if (last + 2 <= first + 1) { - return Tcl_NewObj(); - } /* * Optimize the case where we're really dealing with a bytearray object @@ -855,7 +849,7 @@ TclGetRange( if (last >= length) { last = length - 1; } - if (last < first) { + if (last + 1 < first + 1) { TclNewObj(newObjPtr); return newObjPtr; } @@ -867,7 +861,7 @@ TclGetRange( if (last >= numChars) { last = numChars - 1; } - if (last < first) { + if (last + 1 < first + 1) { TclNewObj(newObjPtr); return newObjPtr; } @@ -875,7 +869,6 @@ TclGetRange( const char *end = TclUtfAtIndex(objPtr->bytes, last + 1); return Tcl_NewStringObj(begin, end - begin); } - /* *---------------------------------------------------------------------- |