cpython-lru_cache-weakref: Modules/arraymodule.c comparison

comparison Modules/arraymodule.c @ 14499:7f23ec5cd9ca legacy-trunk

General cleanup in preparation for a bugfix: removed unused code, useless declarations, added some comments where I had to think too hard to understand what was happening, and changed the primary internal get/set functions to assert they're passed objects of the correct type instead of doing runtime tests for that (it's an internal error that "should never happen", so it's good enough to check it only in the debug build).

author	Tim Peters <tim.peters@gmail.com>
date	Sun, 10 Sep 2000 05:22:54 +0000
parents	6f6f965c5e2d
children	1ec6c63347ea

comparison

equal deleted inserted replaced

-:371e88af645f
+:7f23ec5cd9ca
 /* Array object implementation */
 /* An array is a uniform list -- all items have the same type.
 The item type is restricted to simple C types like int or float */
 #include <limits.h>
 #endif /* HAVE_LIMITS_H */
 struct arrayobject; /* Forward */
+/* All possible arraydescr values are defined in the vector "descriptors"
+* below.  That's defined later because the appropriate get and set
+* functions aren't visible yet.
+*/
 struct arraydescr {
 	int typecode;
 	int itemsize;
 	PyObject * (*getitem)(struct arrayobject *, int);
 	int (*setitem)(struct arrayobject *, int, PyObject *);
 staticforward PyTypeObject Arraytype;
 #define is_arrayobject(op) ((op)->ob_type == &Arraytype)
-/* Forward */
+/****************************************************************************
-static PyObject *newarrayobject(int, struct arraydescr *);
+Get and Set functions for each type.
-#if 0
+A Get function takes an arrayobject* and an integer index, returning the
-static int getarraysize(PyObject *);
+array value at that index wrapped in an appropriate PyObject*.
-#endif
+A Set function takes an arrayobject, integer index, and PyObject*; sets
-static PyObject *getarrayitem(PyObject *, int);
+the array value at that index to the raw C data extracted from the PyObject*,
-static int setarrayitem(PyObject *, int, PyObject *);
+and returns 0 if successful, else nonzero on failure (PyObject* not of an
-#if 0
+appropriate type or value).
-static int insarrayitem(PyObject *, int, PyObject *);
+Note that the basic Get and Set functions do NOT check that the index is
-static int addarrayitem(PyObject *, PyObject *);
+in bounds; that's the responsibility of the caller.
-#endif
+****************************************************************************/
 static PyObject *
 c_getitem(arrayobject *ap, int i)
 {
 	return PyString_FromStringAndSize(&((char *)ap->ob_item)[i], 1);
 			PyErr_SetString(PyExc_OverflowError,
 				"unsigned int is less than minimum");
 			return -1;
 		}
 		x = (unsigned long)y;
 	}
 	if (x > UINT_MAX) {
 		PyErr_SetString(PyExc_OverflowError,
 			"unsigned int is greater than maximum");
 		return -1;
 			PyErr_SetString(PyExc_OverflowError,
 				"unsigned long is less than minimum");
 			return -1;
 		}
 		x = (unsigned long)y;
 	}
 	if (x > ULONG_MAX) {
 		PyErr_SetString(PyExc_OverflowError,
 			"unsigned long is greater than maximum");
 		return -1;
 	}
 	if (i >= 0)
 		((unsigned long *)ap->ob_item)[i] = x;
 	return 0;
 }
 	{'f', sizeof(float), f_getitem, f_setitem},
 	{'d', sizeof(double), d_getitem, d_setitem},
 	{'\0', 0, 0, 0} /* Sentinel */
 };
 /* If we ever allow items larger than double, we must change reverse()! */
+/****************************************************************************
+Implementations of array object methods.
+****************************************************************************/
 static PyObject *
 newarrayobject(int size, struct arraydescr *descr)
 {
 	arrayobject *op;
 	}
 	op->ob_descr = descr;
 	return (PyObject *) op;
 }
-#if 0
-static int
-getarraysize(PyObject *op)
-{
-	if (!is_arrayobject(op)) {
-		PyErr_BadInternalCall();
-		return -1;
-	}
-	return ((arrayobject *)op) -> ob_size;
-}
-#endif
 static PyObject *
 getarrayitem(PyObject *op, int i)
 {
 	register arrayobject *ap;
-	if (!is_arrayobject(op)) {
+	assert(is_arrayobject(op));
-		PyErr_BadInternalCall();
-		return NULL;
-	}
 	ap = (arrayobject *)op;
 	if (i < 0 || i >= ap->ob_size) {
 		PyErr_SetString(PyExc_IndexError, "array index out of range");
 		return NULL;
 	}
 		(self->ob_size-where)*self->ob_descr->itemsize);
 	self->ob_item = items;
 	self->ob_size++;
 	return (*self->ob_descr->setitem)(self, where, v);
 }
-#if 0
-static int
-insarrayitem(PyObject *op, int where, PyObject *newitem)
-{
-	if (!is_arrayobject(op)) {
-		PyErr_BadInternalCall();
-		return -1;
-	}
-	return ins1((arrayobject *)op, where, newitem);
-}
-static int
-addarrayitem(PyObject *op, PyObject *newitem)
-{
-	if (!is_arrayobject(op)) {
-		PyErr_BadInternalCall();
-		return -1;
-	}
-	return ins1((arrayobject *)op,
-		(int) ((arrayobject *)op)->ob_size, newitem);
-}
-#endif
 /* Methods */
 static void
 array_dealloc(arrayobject *op)
 }
 static int
 setarrayitem(PyObject *a, int i, PyObject *v)
 {
-	if (!is_arrayobject(a)) {
+	assert(is_arrayobject(a));
-		PyErr_BadInternalCall();
-		return -1;
-	}
 	return array_ass_item((arrayobject *)a, i, v);
 }
 static PyObject *
 ins(arrayobject *self, int where, PyObject *v)
 static PyObject *
 array_extend(arrayobject *self, PyObject *args)
 {
 	int size;
 PyObject    *bb;
 	if (!PyArg_ParseTuple(args, "O:extend", &bb))
 return NULL;
 	if (!is_arrayobject(bb)) {
 		PyErr_Format(PyExc_TypeError,
 			     "can only extend array with array (not \"%.200s\")",
 			     bb->ob_type->tp_name);
 		return NULL;
 			memmove(tmp, p, itemsize);
 			memmove(p, q, itemsize);
 			memmove(q, tmp, itemsize);
 		}
 	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
 static char reverse_doc [] =
 static PyBufferProcs array_as_buffer = {
 	(getreadbufferproc)array_buffer_getreadbuf,
 	(getwritebufferproc)array_buffer_getwritebuf,
 	(getsegcountproc)array_buffer_getsegcount,
 };
 static PyObject *
 a_array(PyObject *self, PyObject *args)
 {
 	char c;

Mercurial > cpython-lru_cache-weakref

comparison Modules/arraymodule.c @ 14499:7f23ec5cd9ca legacy-trunk