Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28970/Objects Modified Files: listobject.c Log Message: list_ass_slice(): Document the obscure new intent that deleting a slice of no more than 8 elements cannot fail. listpop(): Take advantage of that its calls to list_resize() and list_ass_slice() can't fail. This is assert'ed in a debug build now, but in an icky way. That is, you can't say: assert(some_call() >= 0); because then some_call() won't occur at all in a release build. So it has to be a big pile of #ifdefs on Py_DEBUG (yuck), or the pleasant: status = some_call(); assert(status >= 0); But in that case, compilers may whine in a release build, because status appears unused then. I'm not certain the ugly trick I used here will convince all compilers to shut up about status (status is always "used" now, as the first (ignored) clause in a comma expression). Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.217 retrieving revision 2.218 diff -C2 -d -r2.217 -r2.218 *** listobject.c 31 Jul 2004 02:54:42 -0000 2.217 --- listobject.c 31 Jul 2004 21:53:19 -0000 2.218 *************** *** 520,523 **** --- 520,529 ---- } + /* a[ilow:ihigh] = v if v != NULL. + * del a[ilow:ihigh] if v == NULL. + * + * Special speed gimmick: when v is NULL and ihigh - ilow <= 8, it's + * guaranteed the call cannot fail. + */ static int list_ass_slice(PyListObject *a, int ilow, int ihigh, PyObject *v) *************** *** 824,827 **** --- 830,834 ---- int i = -1; PyObject *v, *arg = NULL; + int status; if (!PyArg_UnpackTuple(args, "pop", 0, 1, &arg)) *************** *** 846,859 **** v = self->ob_item[i]; if (i == self->ob_size - 1) { ! if (list_resize(self, self->ob_size - 1) == -1) ! return NULL; ! return v; } Py_INCREF(v); ! if (list_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) { ! Py_DECREF(v); ! return NULL; ! } ! return v; } --- 853,867 ---- v = self->ob_item[i]; if (i == self->ob_size - 1) { ! status = list_resize(self, self->ob_size - 1); ! assert(status >= 0); ! return v; /* and v now owns the reference the list had */ } Py_INCREF(v); ! status = list_ass_slice(self, i, i+1, (PyObject *)NULL); ! assert(status >= 0); ! /* Use status, so that in a release build compilers don't ! * complain about the unused name. ! */ ! return status, v; }