summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-03-01 19:29:00 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-03-01 19:29:00 (GMT)
commit947cf558f6516fe5aac5fc54dd389b88a10d1f6f (patch)
tree4d294c7a1eb7e8a66dad046a5f9dda8a0939c901
parent0221a5309b5b2d0188aa94ea8354ec9e708ff1ea (diff)
downloadtcl-947cf558f6516fe5aac5fc54dd389b88a10d1f6f.zip
tcl-947cf558f6516fe5aac5fc54dd389b88a10d1f6f.tar.gz
tcl-947cf558f6516fe5aac5fc54dd389b88a10d1f6f.tar.bz2
* generic/tclCmdIL.c (Tcl_LrangeObjCmd): Rewrite in the same
spirit; avoid shimmer effects rather than react to them.
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclCmdIL.c71
2 files changed, 27 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog
index 126deb2..1c9e185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-03-01 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclCmdIL.c (Tcl_LrangeObjCmd): Rewrite in the same
+ spirit; avoid shimmer effects rather than react to them.
+
* generic/tclCmdAH.c (Tcl_ForeachObjCmd): Stop throwing away
* tests/foreach.test (foreach-1.14): useful error information when
loop variable sets fail.
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 560c9cf..1a961ac 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -16,7 +16,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCmdIL.c,v 1.98 2007/03/01 17:30:55 dgp Exp $
+ * RCS: @(#) $Id: tclCmdIL.c,v 1.99 2007/03/01 19:29:01 dgp Exp $
*/
#include "tclInt.h"
@@ -3109,7 +3109,7 @@ Tcl_LrangeObjCmd(
{
Tcl_Obj *listPtr;
Tcl_Obj **elemPtrs;
- int listLen, first, last, numElems, result;
+ int listLen, first, result;
if (objc != 4) {
Tcl_WrongNumArgs(interp, 1, objv, "list first last");
@@ -3121,59 +3121,36 @@ Tcl_LrangeObjCmd(
* pointer to its array of element pointers.
*/
- listPtr = objv[1];
- result = Tcl_ListObjGetElements(interp, listPtr, &listLen, &elemPtrs);
- if (result != TCL_OK) {
- return result;
- }
-
- /*
- * Get the first and last indexes.
- */
-
- result = TclGetIntForIndex(interp, objv[2], /*endValue*/ (listLen - 1),
- &first);
- if (result != TCL_OK) {
- return result;
- }
- if (first < 0) {
- first = 0;
+ listPtr = TclListObjCopy(interp, objv[1]);
+ if (listPtr == NULL) {
+ return TCL_ERROR;
}
+ Tcl_ListObjGetElements(NULL, listPtr, &listLen, &elemPtrs);
- result = TclGetIntForIndex(interp, objv[3], /*endValue*/ (listLen - 1),
- &last);
- if (result != TCL_OK) {
- return result;
- }
- if (last >= listLen) {
- last = (listLen - 1);
- }
+ result = TclGetIntForIndex(interp, objv[2], /*endValue*/ listLen - 1, &first);
+ if (result == TCL_OK) {
+ int last;
- if (first > last) {
- return TCL_OK; /* the result is an empty object */
- }
+ if (first < 0) {
+ first = 0;
+ }
- /*
- * Make sure listPtr still refers to a list object. It might have been
- * converted to an int above if the argument objects were shared.
- */
+ result = TclGetIntForIndex(interp, objv[3], /*endValue*/ listLen - 1, &last);
+ if (result == TCL_OK) {
+ if (last >= listLen) {
+ last = (listLen - 1);
+ }
- if (listPtr->typePtr != &tclListType) {
- result = Tcl_ListObjGetElements(interp, listPtr, &listLen,
- &elemPtrs);
- if (result != TCL_OK) {
- return result;
+ if (first <= last) {
+ int numElems = (last - first + 1);
+ Tcl_SetObjResult(interp,
+ Tcl_NewListObj(numElems, &(elemPtrs[first])));
+ }
}
}
- /*
- * Extract a range of fields. We modify the interpreter's result object to
- * be a list object containing the specified elements.
- */
-
- numElems = (last - first + 1);
- Tcl_SetObjResult(interp, Tcl_NewListObj(numElems, &(elemPtrs[first])));
- return TCL_OK;
+ Tcl_DecrRefCount(listPtr);
+ return result;
}
/*