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

annotate Modules/arraymodule.c @ 42669:2c51be9904de

Code review of the new buffer protocol. Mostly add questions that should be answered with the comments removed. There are many places that require checks when doing arithmetic for memory sizes when allocating memory. Otherwise, overflow is possible with a subsequent crash. Fix SF #1777057 which was a result of not initializing the new BufferError properly. Had to update the test for exceptions for BufferError too.

author	Neal Norwitz <nnorwitz@gmail.com>
date	Sun, 19 Aug 2007 04:23:20 +0000
parents	85c22b4d4455
children	cd4591b754e0

rev	line source
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Array object implementation */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	3 /* An array is a uniform list -- all items have the same type.
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	4 The item type is restricted to simple C types like int or float */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	5
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	6 #define PY_SSIZE_T_CLEAN
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	7 #include "Python.h"
32159 2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	8 #include "structmember.h"
4634 9facbab152cd Removed some unneeded header files and reedited with a fixed-width font Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4628 diff changeset	9
1797 b167e3350491 Changes for Mac Guido van Rossum <guido@python.org> parents: 1746 diff changeset	10 #ifdef STDC_HEADERS
b167e3350491 Changes for Mac Guido van Rossum <guido@python.org> parents: 1746 diff changeset	11 #include <stddef.h>
11242 0061ca4865d7 Tiny patch by Mark Hammond to avoid sys/types.h if we don't have it Guido van Rossum <guido@python.org> parents: 10434 diff changeset	12 #else /* !STDC_HEADERS */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	13 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	14 #include <sys/types.h> /* For size_t */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	15 #endif /* HAVE_SYS_TYPES_H */
11242 0061ca4865d7 Tiny patch by Mark Hammond to avoid sys/types.h if we don't have it Guido van Rossum <guido@python.org> parents: 10434 diff changeset	16 #endif /* !STDC_HEADERS */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	17
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	18 struct arrayobject; /* Forward */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	19
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	20 /* All possible arraydescr values are defined in the vector "descriptors"
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	21 * below. That's defined later because the appropriate get and set
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	22 * functions aren't visible yet.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	23 */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	24 struct arraydescr {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	25 int typecode;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	26 int itemsize;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	27 PyObject * (getitem)(struct arrayobject , Py_ssize_t);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	28 int (setitem)(struct arrayobject , Py_ssize_t, PyObject *);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	29 const char *formats;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	30 };
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	31
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	32 typedef struct arrayobject {
36544 23e23e15e7e7 Bug #1432350: arrayobject should use PyObject_VAR_HEAD Georg Brandl <georg@python.org> parents: 36529 diff changeset	33 PyObject_VAR_HEAD
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	34 char *ob_item;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	35 Py_ssize_t allocated;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	36 struct arraydescr *ob_descr;
32159 2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	37 PyObject weakreflist; / List of weak references */
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	38 int ob_exports; /* Number of exported buffers */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	39 } arrayobject;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	40
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23929 diff changeset	41 static PyTypeObject Arraytype;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	42
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	43 #ifdef Py_UNICODE_WIDE
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	44 #define PyArr_UNI 'w'
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	45 #else
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	46 #define PyArr_UNI 'u'
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	47 #endif
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	48
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	49 #define array_Check(op) PyObject_TypeCheck(op, &Arraytype)
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	50 #define array_CheckExact(op) (Py_Type(op) == &Arraytype)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	51
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	52 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	53 array_resize(arrayobject *self, Py_ssize_t newsize)
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	54 {
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	55 char *items;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	56 size_t _new_size;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	57
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	58 /* Bypass realloc() when a previous overallocation is large enough
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	59 to accommodate the newsize. If the newsize is 16 smaller than the
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	60 current size, then proceed with the realloc() to shrink the list.
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	61 */
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	62
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	63 if (self->allocated >= newsize &&
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	64 Py_Size(self) < newsize + 16 &&
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	65 self->ob_item != NULL) {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	66 Py_Size(self) = newsize;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	67 return 0;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	68 }
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	69
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	70 if (self->ob_exports > 0) {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	71 PyErr_SetString(PyExc_BufferError,
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	72 "cannot resize an array that is exporting data");
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	73 return -1;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	74 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	75
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	76 /* This over-allocates proportional to the array size, making room
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	77 * for additional growth. The over-allocation is mild, but is
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	78 * enough to give linear-time amortized behavior over a long
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	79 * sequence of appends() in the presence of a poorly-performing
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	80 * system realloc().
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	81 * The growth pattern is: 0, 4, 8, 16, 25, 34, 46, 56, 67, 79, ...
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	82 * Note, the pattern starts out the same as for lists but then
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	83 * grows at a smaller rate so that larger arrays only overallocate
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	84 * by about 1/16th -- this is done because arrays are presumed to be more
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	85 * memory critical.
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	86 */
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	87
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	88 _new_size = (newsize >> 4) + (Py_Size(self) < 8 ? 3 : 7) + newsize;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	89 items = self->ob_item;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	90 /* XXX The following multiplication and division does not optimize away
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	91 like it does for lists since the size is not known at compile time */
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	92 if (_new_size <= ((~(size_t)0) / self->ob_descr->itemsize))
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	93 PyMem_RESIZE(items, char, (_new_size * self->ob_descr->itemsize));
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	94 else
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	95 items = NULL;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	96 if (items == NULL) {
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	97 PyErr_NoMemory();
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	98 return -1;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	99 }
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	100 self->ob_item = items;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	101 Py_Size(self) = newsize;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	102 self->allocated = _new_size;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	103 return 0;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	104 }
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	105
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	106 /****************************************************************************
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	107 Get and Set functions for each type.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	108 A Get function takes an arrayobject* and an integer index, returning the
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	109 array value at that index wrapped in an appropriate PyObject*.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	110 A Set function takes an arrayobject, integer index, and PyObject*; sets
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	111 the array value at that index to the raw C data extracted from the PyObject*,
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	112 and returns 0 if successful, else nonzero on failure (PyObject* not of an
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	113 appropriate type or value).
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	114 Note that the basic Get and Set functions do NOT check that the index is
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	115 in bounds; that's the responsibility of the caller.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	116 ****************************************************************************/
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	117
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	118 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	119 b_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	120 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	121 long x = ((char *)ap->ob_item)[i];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	122 if (x >= 128)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	123 x -= 256;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	124 return PyInt_FromLong(x);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	125 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	126
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	127 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	128 b_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	129 {
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	130 short x;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	131 /* PyArg_Parse's 'b' formatter is for an unsigned char, therefore
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	132 must use the next size up that is signed ('h') and manually do
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	133 the overflow checking */
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	134 if (!PyArg_Parse(v, "h;array item must be integer", &x))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	135 return -1;
13263 84879ab71b9f In b_setitem(), instead of the platform dependent CHAR_MIN and Guido van Rossum <guido@python.org> parents: 13256 diff changeset	136 else if (x < -128) {
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	137 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	138 "signed char is less than minimum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	139 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	140 }
13263 84879ab71b9f In b_setitem(), instead of the platform dependent CHAR_MIN and Guido van Rossum <guido@python.org> parents: 13256 diff changeset	141 else if (x > 127) {
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	142 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	143 "signed char is greater than maximum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	144 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	145 }
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	146 if (i >= 0)
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	147 ((char *)ap->ob_item)[i] = (char)x;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	148 return 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	149 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	150
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	151 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	152 BB_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	153 {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	154 long x = ((unsigned char *)ap->ob_item)[i];
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	155 return PyInt_FromLong(x);
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	156 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	157
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	158 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	159 BB_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	160 {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	161 unsigned char x;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	162 /* 'B' == unsigned char, maps to PyArg_Parse's 'b' formatter */
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	163 if (!PyArg_Parse(v, "b;array item must be integer", &x))
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	164 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	165 if (i >= 0)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	166 ((char *)ap->ob_item)[i] = x;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	167 return 0;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	168 }
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	169
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	170 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	171 u_getitem(arrayobject *ap, Py_ssize_t i)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	172 {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	173 return PyUnicode_FromUnicode(&((Py_UNICODE *) ap->ob_item)[i], 1);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	174 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	175
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	176 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	177 u_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	178 {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	179 Py_UNICODE *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	180 Py_ssize_t len;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	181
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	182 if (!PyArg_Parse(v, "u#;array item must be unicode character", &p, &len))
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	183 return -1;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	184 if (len != 1) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	185 PyErr_SetString(PyExc_TypeError,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	186 "array item must be unicode character");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	187 return -1;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	188 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	189 if (i >= 0)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	190 ((Py_UNICODE *)ap->ob_item)[i] = p[0];
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	191 return 0;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	192 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	193
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	194 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	195 h_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	196 {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	197 return PyInt_FromLong((long) ((short *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	198 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	199
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	200 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	201 h_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	202 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	203 short x;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	204 /* 'h' == signed short, maps to PyArg_Parse's 'h' formatter */
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	205 if (!PyArg_Parse(v, "h;array item must be integer", &x))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	206 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	207 if (i >= 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	208 ((short *)ap->ob_item)[i] = x;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	209 return 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	210 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	211
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	212 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	213 HH_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	214 {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	215 return PyInt_FromLong((long) ((unsigned short *)ap->ob_item)[i]);
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	216 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	217
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	218 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	219 HH_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	220 {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	221 int x;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	222 /* PyArg_Parse's 'h' formatter is for a signed short, therefore
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	223 must use the next size up and manually do the overflow checking */
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	224 if (!PyArg_Parse(v, "i;array item must be integer", &x))
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	225 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	226 else if (x < 0) {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	227 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	228 "unsigned short is less than minimum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	229 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	230 }
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	231 else if (x > USHRT_MAX) {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	232 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	233 "unsigned short is greater than maximum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	234 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	235 }
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	236 if (i >= 0)
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	237 ((short *)ap->ob_item)[i] = (short)x;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	238 return 0;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	239 }
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	240
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	241 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	242 i_getitem(arrayobject *ap, Py_ssize_t i)
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	243 {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	244 return PyInt_FromLong((long) ((int *)ap->ob_item)[i]);
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	245 }
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	246
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	247 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	248 i_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	249 {
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	250 int x;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	251 /* 'i' == signed int, maps to PyArg_Parse's 'i' formatter */
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	252 if (!PyArg_Parse(v, "i;array item must be integer", &x))
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	253 return -1;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	254 if (i >= 0)
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	255 ((int *)ap->ob_item)[i] = x;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	256 return 0;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	257 }
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	258
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	259 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	260 II_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	261 {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	262 return PyLong_FromUnsignedLong(
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	263 (unsigned long) ((unsigned int *)ap->ob_item)[i]);
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	264 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	265
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	266 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	267 II_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	268 {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	269 unsigned long x;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	270 if (PyLong_Check(v)) {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	271 x = PyLong_AsUnsignedLong(v);
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	272 if (x == (unsigned long) -1 && PyErr_Occurred())
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	273 return -1;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	274 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	275 else {
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	276 long y;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	277 if (!PyArg_Parse(v, "l;array item must be integer", &y))
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	278 return -1;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	279 if (y < 0) {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	280 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	281 "unsigned int is less than minimum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	282 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	283 }
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	284 x = (unsigned long)y;
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	285
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	286 }
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	287 if (x > UINT_MAX) {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	288 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	289 "unsigned int is greater than maximum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	290 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	291 }
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	292
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	293 if (i >= 0)
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	294 ((unsigned int *)ap->ob_item)[i] = (unsigned int)x;
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	295 return 0;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	296 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	297
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	298 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	299 l_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	300 {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	301 return PyInt_FromLong(((long *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	302 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	303
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	304 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	305 l_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	306 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	307 long x;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	308 if (!PyArg_Parse(v, "l;array item must be integer", &x))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	309 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	310 if (i >= 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	311 ((long *)ap->ob_item)[i] = x;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	312 return 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	313 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	314
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	315 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	316 LL_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	317 {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	318 return PyLong_FromUnsignedLong(((unsigned long *)ap->ob_item)[i]);
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	319 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	320
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	321 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	322 LL_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	323 {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	324 unsigned long x;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	325 if (PyLong_Check(v)) {
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	326 x = PyLong_AsUnsignedLong(v);
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	327 if (x == (unsigned long) -1 && PyErr_Occurred())
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	328 return -1;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	329 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	330 else {
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	331 long y;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	332 if (!PyArg_Parse(v, "l;array item must be integer", &y))
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	333 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	334 if (y < 0) {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	335 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	336 "unsigned long is less than minimum");
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	337 return -1;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	338 }
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	339 x = (unsigned long)y;
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	340
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	341 }
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	342 if (x > ULONG_MAX) {
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	343 PyErr_SetString(PyExc_OverflowError,
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	344 "unsigned long is greater than maximum");
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	345 return -1;
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	346 }
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	347
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	348 if (i >= 0)
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	349 ((unsigned long *)ap->ob_item)[i] = x;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	350 return 0;
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	351 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	352
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	353 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	354 f_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	355 {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	356 return PyFloat_FromDouble((double) ((float *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	357 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	358
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	359 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	360 f_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	361 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	362 float x;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	363 if (!PyArg_Parse(v, "f;array item must be float", &x))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	364 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	365 if (i >= 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	366 ((float *)ap->ob_item)[i] = x;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	367 return 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	368 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	369
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	370 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	371 d_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	372 {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	373 return PyFloat_FromDouble(((double *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	374 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	375
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	376 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	377 d_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	378 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	379 double x;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	380 if (!PyArg_Parse(v, "d;array item must be float", &x))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	381 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	382 if (i >= 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	383 ((double *)ap->ob_item)[i] = x;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	384 return 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	385 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	386
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	387
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	388 /* Description of types */
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	389 static struct arraydescr descriptors[] = {
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	390 {'b', sizeof(char), b_getitem, b_setitem},
5542 cfc13f3f3876 Address the following problem on DOS and Win 3.1, reported by Jim Guido van Rossum <guido@python.org> parents: 5410 diff changeset	391 {'B', sizeof(char), BB_getitem, BB_setitem},
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	392 {PyArr_UNI, sizeof(Py_UNICODE), u_getitem, u_setitem},
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	393 {'h', sizeof(short), h_getitem, h_setitem},
5542 cfc13f3f3876 Address the following problem on DOS and Win 3.1, reported by Jim Guido van Rossum <guido@python.org> parents: 5410 diff changeset	394 {'H', sizeof(short), HH_getitem, HH_setitem},
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	395 {'i', sizeof(int), i_getitem, i_setitem},
5542 cfc13f3f3876 Address the following problem on DOS and Win 3.1, reported by Jim Guido van Rossum <guido@python.org> parents: 5410 diff changeset	396 {'I', sizeof(int), II_getitem, II_setitem},
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	397 {'l', sizeof(long), l_getitem, l_setitem},
5542 cfc13f3f3876 Address the following problem on DOS and Win 3.1, reported by Jim Guido van Rossum <guido@python.org> parents: 5410 diff changeset	398 {'L', sizeof(long), LL_getitem, LL_setitem},
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	399 {'f', sizeof(float), f_getitem, f_setitem},
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	400 {'d', sizeof(double), d_getitem, d_setitem},
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	401 {'\0', 0, 0, 0} /* Sentinel */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	402 };
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	403
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	404 /****************************************************************************
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	405 Implementations of array object methods.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	406 ****************************************************************************/
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	407
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	408 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	409 newarrayobject(PyTypeObject type, Py_ssize_t size, struct arraydescr descr)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	410 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	411 arrayobject *op;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	412 size_t nbytes;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	413
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	414 if (size < 0) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	415 PyErr_BadInternalCall();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	416 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	417 }
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	418
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	419 nbytes = size * descr->itemsize;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	420 /* Check for overflow */
5318 2c4b802a3b5d Keep Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 4875 diff changeset	421 if (nbytes / descr->itemsize != (size_t)size) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	422 return PyErr_NoMemory();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	423 }
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	424 op = (arrayobject *) type->tp_alloc(type, 0);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	425 if (op == NULL) {
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	426 return NULL;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	427 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	428 Py_Size(op) = size;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	429 if (size <= 0) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	430 op->ob_item = NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	431 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	432 else {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	433 op->ob_item = PyMem_NEW(char, nbytes);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	434 if (op->ob_item == NULL) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11711 diff changeset	435 PyObject_Del(op);
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	436 return PyErr_NoMemory();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	437 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	438 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	439 op->ob_descr = descr;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	440 op->allocated = size;
32159 2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	441 op->weakreflist = NULL;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	442 op->ob_exports = 0;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	443 return (PyObject *) op;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	444 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	445
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	446 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	447 getarrayitem(PyObject *op, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	448 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	449 register arrayobject *ap;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	450 assert(array_Check(op));
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	451 ap = (arrayobject *)op;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	452 assert(i>=0 && i<Py_Size(ap));
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	453 return (*ap->ob_descr->getitem)(ap, i);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	454 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	455
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	456 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	457 ins1(arrayobject self, Py_ssize_t where, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	458 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	459 char *items;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	460 Py_ssize_t n = Py_Size(self);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	461 if (v == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	462 PyErr_BadInternalCall();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	463 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	464 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	465 if ((*self->ob_descr->setitem)(self, -1, v) < 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	466 return -1;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	467
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	468 if (array_resize(self, n+1) == -1)
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	469 return -1;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	470 items = self->ob_item;
29163 2bb5ceef9ac3 Fix array.array.insert(), so that it treats negative indices as Walter Dörwald <walter@livinglogic.de> parents: 28760 diff changeset	471 if (where < 0) {
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	472 where += n;
29163 2bb5ceef9ac3 Fix array.array.insert(), so that it treats negative indices as Walter Dörwald <walter@livinglogic.de> parents: 28760 diff changeset	473 if (where < 0)
2bb5ceef9ac3 Fix array.array.insert(), so that it treats negative indices as Walter Dörwald <walter@livinglogic.de> parents: 28760 diff changeset	474 where = 0;
2bb5ceef9ac3 Fix array.array.insert(), so that it treats negative indices as Walter Dörwald <walter@livinglogic.de> parents: 28760 diff changeset	475 }
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	476 if (where > n)
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	477 where = n;
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	478 /* appends don't need to call memmove() */
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	479 if (where != n)
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	480 memmove(items + (where+1)*self->ob_descr->itemsize,
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	481 items + where*self->ob_descr->itemsize,
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	482 (n-where)*self->ob_descr->itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	483 return (*self->ob_descr->setitem)(self, where, v);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	484 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	485
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	486 /* Methods */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	487
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	488 static void
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	489 array_dealloc(arrayobject *op)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	490 {
32159 2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	491 if (op->weakreflist != NULL)
2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	492 PyObject_ClearWeakRefs((PyObject *) op);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	493 if (op->ob_item != NULL)
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	494 PyMem_DEL(op->ob_item);
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	495 Py_Type(op)->tp_free((PyObject *)op);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	496 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	497
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	498 static PyObject *
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	499 array_richcompare(PyObject v, PyObject w, int op)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	500 {
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	501 arrayobject va, wa;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	502 PyObject *vi = NULL;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	503 PyObject *wi = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	504 Py_ssize_t i, k;
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	505 PyObject *res;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	506
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	507 if (!array_Check(v) \|\| !array_Check(w)) {
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	508 Py_INCREF(Py_NotImplemented);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	509 return Py_NotImplemented;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	510 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	511
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	512 va = (arrayobject *)v;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	513 wa = (arrayobject *)w;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	514
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	515 if (Py_Size(va) != Py_Size(wa) && (op == Py_EQ \|\| op == Py_NE)) {
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	516 /* Shortcut: if the lengths differ, the arrays differ */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	517 if (op == Py_EQ)
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	518 res = Py_False;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	519 else
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	520 res = Py_True;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	521 Py_INCREF(res);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	522 return res;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	523 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	524
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	525 /* Search for the first index where items are different */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	526 k = 1;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	527 for (i = 0; i < Py_Size(va) && i < Py_Size(wa); i++) {
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	528 vi = getarrayitem(v, i);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	529 wi = getarrayitem(w, i);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	530 if (vi == NULL \|\| wi == NULL) {
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	531 Py_XDECREF(vi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	532 Py_XDECREF(wi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	533 return NULL;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	534 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	535 k = PyObject_RichCompareBool(vi, wi, Py_EQ);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	536 if (k == 0)
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	537 break; /* Keeping vi and wi alive! */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	538 Py_DECREF(vi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	539 Py_DECREF(wi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	540 if (k < 0)
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	541 return NULL;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	542 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	543
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	544 if (k) {
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	545 /* No more items to compare -- compare sizes */
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	546 Py_ssize_t vs = Py_Size(va);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	547 Py_ssize_t ws = Py_Size(wa);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	548 int cmp;
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	549 switch (op) {
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	550 case Py_LT: cmp = vs < ws; break;
16268 c2ce9b2e5bb4 Correct one-line typo, reported by yole @ SF, bug 130077. Guido van Rossum <guido@python.org> parents: 16232 diff changeset	551 case Py_LE: cmp = vs <= ws; break;
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	552 case Py_EQ: cmp = vs == ws; break;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	553 case Py_NE: cmp = vs != ws; break;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	554 case Py_GT: cmp = vs > ws; break;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	555 case Py_GE: cmp = vs >= ws; break;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	556 default: return NULL; /* cannot happen */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	557 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	558 if (cmp)
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	559 res = Py_True;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	560 else
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	561 res = Py_False;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	562 Py_INCREF(res);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	563 return res;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	564 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	565
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	566 /* We have an item that differs. First, shortcuts for EQ/NE */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	567 if (op == Py_EQ) {
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	568 Py_INCREF(Py_False);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	569 res = Py_False;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	570 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	571 else if (op == Py_NE) {
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	572 Py_INCREF(Py_True);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	573 res = Py_True;
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	574 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	575 else {
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	576 /* Compare the final item again using the proper operator */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	577 res = PyObject_RichCompare(vi, wi, op);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	578 }
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	579 Py_DECREF(vi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	580 Py_DECREF(wi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	581 return res;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	582 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	583
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	584 static Py_ssize_t
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	585 array_length(arrayobject *a)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	586 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	587 return Py_Size(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	588 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	589
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	590 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	591 array_item(arrayobject *a, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	592 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	593 if (i < 0 \|\| i >= Py_Size(a)) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	594 PyErr_SetString(PyExc_IndexError, "array index out of range");
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	595 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	596 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	597 return getarrayitem((PyObject *)a, i);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	598 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	599
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	600 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	601 array_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	602 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	603 arrayobject *np;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	604 if (ilow < 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	605 ilow = 0;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	606 else if (ilow > Py_Size(a))
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	607 ilow = Py_Size(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	608 if (ihigh < 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	609 ihigh = 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	610 if (ihigh < ilow)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	611 ihigh = ilow;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	612 else if (ihigh > Py_Size(a))
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	613 ihigh = Py_Size(a);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	614 np = (arrayobject *) newarrayobject(&Arraytype, ihigh - ilow, a->ob_descr);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	615 if (np == NULL)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	616 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	617 memcpy(np->ob_item, a->ob_item + ilow * a->ob_descr->itemsize,
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	618 (ihigh-ilow) * a->ob_descr->itemsize);
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	619 return (PyObject *)np;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	620 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	621
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	622 static PyObject *
31651 35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	623 array_copy(arrayobject a, PyObject unused)
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	624 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	625 return array_slice(a, 0, Py_Size(a));
31651 35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	626 }
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	627
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	628 PyDoc_STRVAR(copy_doc,
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	629 "copy(array)\n\
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	630 \n\
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	631 Return a copy of the array.");
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	632
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	633 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	634 array_concat(arrayobject a, PyObject bb)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	635 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	636 Py_ssize_t size;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	637 arrayobject *np;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	638 if (!array_Check(bb)) {
12814 b1b260a2de98 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	639 PyErr_Format(PyExc_TypeError,
b1b260a2de98 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	640 "can only append array (not \"%.200s\") to array",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	641 Py_Type(bb)->tp_name);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	642 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	643 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	644 #define b ((arrayobject *)bb)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	645 if (a->ob_descr != b->ob_descr) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	646 PyErr_BadArgument();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	647 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	648 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	649 size = Py_Size(a) + Py_Size(b);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	650 np = (arrayobject *) newarrayobject(&Arraytype, size, a->ob_descr);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	651 if (np == NULL) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	652 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	653 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	654 memcpy(np->ob_item, a->ob_item, Py_Size(a)*a->ob_descr->itemsize);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	655 memcpy(np->ob_item + Py_Size(a)*a->ob_descr->itemsize,
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	656 b->ob_item, Py_Size(b)*b->ob_descr->itemsize);
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	657 return (PyObject *)np;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	658 #undef b
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	659 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	660
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	661 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	662 array_repeat(arrayobject *a, Py_ssize_t n)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	663 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	664 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	665 Py_ssize_t size;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	666 arrayobject *np;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	667 char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	668 Py_ssize_t nbytes;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	669 if (n < 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	670 n = 0;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	671 size = Py_Size(a) * n;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	672 np = (arrayobject *) newarrayobject(&Arraytype, size, a->ob_descr);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	673 if (np == NULL)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	674 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	675 p = np->ob_item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	676 nbytes = Py_Size(a) * a->ob_descr->itemsize;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	677 for (i = 0; i < n; i++) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	678 memcpy(p, a->ob_item, nbytes);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	679 p += nbytes;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	680 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	681 return (PyObject *) np;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	682 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	683
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	684 static int
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	685 array_ass_slice(arrayobject a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	686 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	687 char *item;
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	688 Py_ssize_t n; /* Size of replacement array */
9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	689 Py_ssize_t d; /* Change in size */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	690 #define b ((arrayobject *)v)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	691 if (v == NULL)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	692 n = 0;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	693 else if (array_Check(v)) {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	694 n = Py_Size(b);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	695 if (a == b) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	696 /* Special case "a[i:j] = a" -- copy b first */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	697 int ret;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	698 v = array_slice(b, 0, n);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	699 if (!v)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	700 return -1;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	701 ret = array_ass_slice(a, ilow, ihigh, v);
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	702 Py_DECREF(v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	703 return ret;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	704 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	705 if (b->ob_descr != a->ob_descr) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	706 PyErr_BadArgument();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	707 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	708 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	709 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	710 else {
12814 b1b260a2de98 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	711 PyErr_Format(PyExc_TypeError,
b1b260a2de98 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	712 "can only assign array (not \"%.200s\") to array slice",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	713 Py_Type(v)->tp_name);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	714 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	715 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	716 if (ilow < 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	717 ilow = 0;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	718 else if (ilow > Py_Size(a))
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	719 ilow = Py_Size(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	720 if (ihigh < 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	721 ihigh = 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	722 if (ihigh < ilow)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	723 ihigh = ilow;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	724 else if (ihigh > Py_Size(a))
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	725 ihigh = Py_Size(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	726 item = a->ob_item;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	727 d = n - (ihigh-ilow);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	728 if (d < 0) { /* Delete -d items */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	729 memmove(item + (ihigh+d)*a->ob_descr->itemsize,
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	730 item + ihigh*a->ob_descr->itemsize,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	731 (Py_Size(a)-ihigh)*a->ob_descr->itemsize);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	732 Py_Size(a) += d;
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	733 PyMem_RESIZE(item, char, Py_Size(a)*a->ob_descr->itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	734 /* Can't fail */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	735 a->ob_item = item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	736 a->allocated = Py_Size(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	737 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	738 else if (d > 0) { /* Insert d items */
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	739 PyMem_RESIZE(item, char,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	740 (Py_Size(a) + d)*a->ob_descr->itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	741 if (item == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	742 PyErr_NoMemory();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	743 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	744 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	745 memmove(item + (ihigh+d)*a->ob_descr->itemsize,
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	746 item + ihigh*a->ob_descr->itemsize,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	747 (Py_Size(a)-ihigh)*a->ob_descr->itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	748 a->ob_item = item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	749 Py_Size(a) += d;
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	750 a->allocated = Py_Size(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	751 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	752 if (n > 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	753 memcpy(item + ilow*a->ob_descr->itemsize, b->ob_item,
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	754 n*b->ob_descr->itemsize);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	755 return 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	756 #undef b
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	757 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	758
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	759 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	760 array_ass_item(arrayobject a, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	761 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	762 if (i < 0 \|\| i >= Py_Size(a)) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	763 PyErr_SetString(PyExc_IndexError,
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	764 "array assignment index out of range");
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	765 return -1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	766 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	767 if (v == NULL)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	768 return array_ass_slice(a, i, i+1, v);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	769 return (*a->ob_descr->setitem)(a, i, v);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	770 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	771
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	772 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	773 setarrayitem(PyObject a, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	774 {
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	775 assert(array_Check(a));
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	776 return array_ass_item((arrayobject *)a, i, v);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	777 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	778
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	779 static int
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	780 array_iter_extend(arrayobject self, PyObject bb)
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	781 {
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	782 PyObject it, v;
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	783
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	784 it = PyObject_GetIter(bb);
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	785 if (it == NULL)
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	786 return -1;
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	787
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	788 while ((v = PyIter_Next(it)) != NULL) {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	789 if (ins1(self, (int) Py_Size(self), v) != 0) {
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	790 Py_DECREF(v);
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	791 Py_DECREF(it);
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	792 return -1;
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	793 }
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	794 Py_DECREF(v);
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	795 }
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	796 Py_DECREF(it);
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	797 if (PyErr_Occurred())
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	798 return -1;
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	799 return 0;
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	800 }
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	801
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	802 static int
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	803 array_do_extend(arrayobject self, PyObject bb)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	804 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	805 Py_ssize_t size;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	806
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	807 if (!array_Check(bb))
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	808 return array_iter_extend(self, bb);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	809 #define b ((arrayobject *)bb)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	810 if (self->ob_descr != b->ob_descr) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	811 PyErr_SetString(PyExc_TypeError,
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	812 "can only extend with array of same kind");
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	813 return -1;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	814 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	815 size = Py_Size(self) + Py_Size(b);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	816 PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	817 if (self->ob_item == NULL) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	818 PyObject_Del(self);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	819 PyErr_NoMemory();
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	820 return -1;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	821 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	822 memcpy(self->ob_item + Py_Size(self)*self->ob_descr->itemsize,
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	823 b->ob_item, Py_Size(b)*b->ob_descr->itemsize);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	824 Py_Size(self) = size;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	825 self->allocated = size;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	826
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	827 return 0;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	828 #undef b
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	829 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	830
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	831 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	832 array_inplace_concat(arrayobject self, PyObject bb)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	833 {
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	834 if (!array_Check(bb)) {
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	835 PyErr_Format(PyExc_TypeError,
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	836 "can only extend array with array (not \"%.200s\")",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	837 Py_Type(bb)->tp_name);
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	838 return NULL;
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	839 }
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	840 if (array_do_extend(self, bb) == -1)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	841 return NULL;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	842 Py_INCREF(self);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	843 return (PyObject *)self;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	844 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	845
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	846 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	847 array_inplace_repeat(arrayobject *self, Py_ssize_t n)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	848 {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	849 char items, p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	850 Py_ssize_t size, i;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	851
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	852 if (Py_Size(self) > 0) {
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	853 if (n < 0)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	854 n = 0;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	855 items = self->ob_item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	856 size = Py_Size(self) * self->ob_descr->itemsize;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	857 if (n == 0) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	858 PyMem_FREE(items);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	859 self->ob_item = NULL;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	860 Py_Size(self) = 0;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	861 self->allocated = 0;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	862 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	863 else {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	864 PyMem_Resize(items, char, n * size);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	865 if (items == NULL)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	866 return PyErr_NoMemory();
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	867 p = items;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	868 for (i = 1; i < n; i++) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	869 p += size;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	870 memcpy(p, items, size);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	871 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	872 self->ob_item = items;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	873 Py_Size(self) *= n;
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	874 self->allocated = Py_Size(self);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	875 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	876 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	877 Py_INCREF(self);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	878 return (PyObject *)self;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	879 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	880
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	881
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	882 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	883 ins(arrayobject self, Py_ssize_t where, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	884 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	885 if (ins1(self, where, v) != 0)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	886 return NULL;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	887 Py_INCREF(Py_None);
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	888 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	889 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	890
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	891 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	892 array_count(arrayobject self, PyObject v)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	893 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	894 Py_ssize_t count = 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	895 Py_ssize_t i;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	896
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	897 for (i = 0; i < Py_Size(self); i++) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	898 PyObject selfi = getarrayitem((PyObject )self, i);
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	899 int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	900 Py_DECREF(selfi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	901 if (cmp > 0)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	902 count++;
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	903 else if (cmp < 0)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	904 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	905 }
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	906 return PyInt_FromSsize_t(count);
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	907 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	908
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	909 PyDoc_STRVAR(count_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	910 "count(x)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	911 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	912 Return number of occurences of x in the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	913
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	914 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	915 array_index(arrayobject self, PyObject v)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	916 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	917 Py_ssize_t i;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	918
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	919 for (i = 0; i < Py_Size(self); i++) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	920 PyObject selfi = getarrayitem((PyObject )self, i);
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	921 int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	922 Py_DECREF(selfi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	923 if (cmp > 0) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	924 return PyInt_FromLong((long)i);
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	925 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	926 else if (cmp < 0)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	927 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	928 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	929 PyErr_SetString(PyExc_ValueError, "array.index(x): x not in list");
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	930 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	931 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	932
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	933 PyDoc_STRVAR(index_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	934 "index(x)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	935 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	936 Return index of first occurence of x in the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	937
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	938 static int
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	939 array_contains(arrayobject self, PyObject v)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	940 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	941 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	942 int cmp;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	943
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	944 for (i = 0, cmp = 0 ; cmp == 0 && i < Py_Size(self); i++) {
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	945 PyObject selfi = getarrayitem((PyObject )self, i);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	946 cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	947 Py_DECREF(selfi);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	948 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	949 return cmp;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	950 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	951
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	952 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	953 array_remove(arrayobject self, PyObject v)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	954 {
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	955 int i;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	956
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	957 for (i = 0; i < Py_Size(self); i++) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	958 PyObject selfi = getarrayitem((PyObject )self,i);
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	959 int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	960 Py_DECREF(selfi);
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	961 if (cmp > 0) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	962 if (array_ass_slice(self, i, i+1,
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	963 (PyObject *)NULL) != 0)
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	964 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	965 Py_INCREF(Py_None);
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	966 return Py_None;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	967 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	968 else if (cmp < 0)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	969 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	970 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	971 PyErr_SetString(PyExc_ValueError, "array.remove(x): x not in list");
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	972 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	973 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	974
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	975 PyDoc_STRVAR(remove_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	976 "remove(x)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	977 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	978 Remove the first occurence of x in the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	979
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	980 static PyObject *
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	981 array_pop(arrayobject self, PyObject args)
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	982 {
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	983 Py_ssize_t i = -1;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	984 PyObject *v;
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	985 if (!PyArg_ParseTuple(args, "\|n:pop", &i))
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	986 return NULL;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	987 if (Py_Size(self) == 0) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	988 /* Special-case most common failure cause */
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	989 PyErr_SetString(PyExc_IndexError, "pop from empty array");
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	990 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	991 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	992 if (i < 0)
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	993 i += Py_Size(self);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	994 if (i < 0 \|\| i >= Py_Size(self)) {
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	995 PyErr_SetString(PyExc_IndexError, "pop index out of range");
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	996 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	997 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	998 v = getarrayitem((PyObject *)self,i);
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	999 if (array_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) {
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1000 Py_DECREF(v);
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1001 return NULL;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1002 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1003 return v;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1004 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1005
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1006 PyDoc_STRVAR(pop_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1007 "pop([i])\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1008 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1009 Return the i-th element and delete it from the array. i defaults to -1.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1010
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1011 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1012 array_extend(arrayobject self, PyObject bb)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1013 {
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1014 if (array_do_extend(self, bb) == -1)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1015 return NULL;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1016 Py_INCREF(Py_None);
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1017 return Py_None;
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1018 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1019
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1020 PyDoc_STRVAR(extend_doc,
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	1021 "extend(array or iterable)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1022 \n\
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	1023 Append items to the end of the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1024
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1025 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1026 array_insert(arrayobject self, PyObject args)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1027 {
36689 11484a72d966 Convert array.array.insert to use Py_ssize_t (like the rest already does.) Thomas Wouters <thomas@python.org> parents: 36544 diff changeset	1028 Py_ssize_t i;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1029 PyObject *v;
36689 11484a72d966 Convert array.array.insert to use Py_ssize_t (like the rest already does.) Thomas Wouters <thomas@python.org> parents: 36544 diff changeset	1030 if (!PyArg_ParseTuple(args, "nO:insert", &i, &v))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1031 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1032 return ins(self, i, v);
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1033 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1034
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1035 PyDoc_STRVAR(insert_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1036 "insert(i,x)\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1037 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1038 Insert a new item x into the array before position i.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1039
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1040
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1041 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1042 array_buffer_info(arrayobject self, PyObject unused)
5982 6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1043 {
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1044 PyObject* retval = NULL;
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1045 retval = PyTuple_New(2);
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1046 if (!retval)
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1047 return NULL;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	1048
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	1049 PyTuple_SET_ITEM(retval, 0, PyLong_FromVoidPtr(self->ob_item));
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1050 PyTuple_SET_ITEM(retval, 1, PyInt_FromLong((long)(Py_Size(self))));
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	1051
705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	1052 return retval;
5982 6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1053 }
6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1054
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1055 PyDoc_STRVAR(buffer_info_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1056 "buffer_info() -> (address, length)\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1057 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1058 Return a tuple (address, length) giving the current memory address and\n\
18851 ef2031c54875 Fix buffer_info() docstring to match reality. See SF bug #444842. Guido van Rossum <guido@python.org> parents: 18036 diff changeset	1059 the length in items of the buffer used to hold array's contents\n\
ef2031c54875 Fix buffer_info() docstring to match reality. See SF bug #444842. Guido van Rossum <guido@python.org> parents: 18036 diff changeset	1060 The length should be multiplied by the itemsize attribute to calculate\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1061 the buffer length in bytes.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1062
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1063
5982 6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1064 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1065 array_append(arrayobject self, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1066 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1067 return ins(self, (int) Py_Size(self), v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1068 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1069
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1070 PyDoc_STRVAR(append_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1071 "append(x)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1072 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1073 Append new value x to the end of the array.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1074
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1075
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1076 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1077 array_byteswap(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1078 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1079 char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1080 Py_ssize_t i;
11522 cbf58cd0bb57 Correct the docstring for byteswap(); error noted by Bernhard Reiter Fred Drake <fdrake@acm.org> parents: 11242 diff changeset	1081
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1082 switch (self->ob_descr->itemsize) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1083 case 1:
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1084 break;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1085 case 2:
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1086 for (p = self->ob_item, i = Py_Size(self); --i >= 0; p += 2) {
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1087 char p0 = p[0];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1088 p[0] = p[1];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1089 p[1] = p0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1090 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1091 break;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1092 case 4:
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1093 for (p = self->ob_item, i = Py_Size(self); --i >= 0; p += 4) {
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1094 char p0 = p[0];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1095 char p1 = p[1];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1096 p[0] = p[3];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1097 p[1] = p[2];
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1098 p[2] = p1;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1099 p[3] = p0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1100 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1101 break;
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1102 case 8:
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1103 for (p = self->ob_item, i = Py_Size(self); --i >= 0; p += 8) {
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1104 char p0 = p[0];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1105 char p1 = p[1];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1106 char p2 = p[2];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1107 char p3 = p[3];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1108 p[0] = p[7];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1109 p[1] = p[6];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1110 p[2] = p[5];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1111 p[3] = p[4];
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1112 p[4] = p3;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1113 p[5] = p2;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1114 p[6] = p1;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1115 p[7] = p0;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1116 }
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1117 break;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1118 default:
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1119 PyErr_SetString(PyExc_RuntimeError,
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1120 "don't know how to byteswap this array type");
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1121 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1122 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1123 Py_INCREF(Py_None);
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1124 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1125 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1126
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1127 PyDoc_STRVAR(byteswap_doc,
11522 cbf58cd0bb57 Correct the docstring for byteswap(); error noted by Bernhard Reiter Fred Drake <fdrake@acm.org> parents: 11242 diff changeset	1128 "byteswap()\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1129 \n\
11522 cbf58cd0bb57 Correct the docstring for byteswap(); error noted by Bernhard Reiter Fred Drake <fdrake@acm.org> parents: 11242 diff changeset	1130 Byteswap all items of the array. If the items in the array are not 1, 2,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1131 4, or 8 bytes in size, RuntimeError is raised.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1132
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1133 static PyObject *
34174 30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1134 array_reduce(arrayobject *array)
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1135 {
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1136 PyObject dict, result;
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1137
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1138 dict = PyObject_GetAttrString((PyObject *)array, "__dict__");
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1139 if (dict == NULL) {
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1140 PyErr_Clear();
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1141 dict = Py_None;
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1142 Py_INCREF(dict);
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1143 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1144 if (Py_Size(array) > 0) {
42305 d0719406b2c6 Change Py_BuildValue to generate Unicode objects for Martin v. Löwis <martin@v.loewis.de> parents: 42145 diff changeset	1145 result = Py_BuildValue("O(cy#)O",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1146 Py_Type(array),
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1147 array->ob_descr->typecode,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1148 array->ob_item,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1149 Py_Size(array) * array->ob_descr->itemsize,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1150 dict);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1151 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1152 result = Py_BuildValue("O(c)O",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1153 Py_Type(array),
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1154 array->ob_descr->typecode,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1155 dict);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1156 }
34174 30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1157 Py_DECREF(dict);
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1158 return result;
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1159 }
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1160
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1161 PyDoc_STRVAR(array_doc, "Return state information for pickling.");
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1162
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1163 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1164 array_reverse(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1165 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1166 register Py_ssize_t itemsize = self->ob_descr->itemsize;
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1167 register char p, q;
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1168 /* little buffer to hold items while swapping */
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1169 char tmp[256]; /* 8 is probably enough -- but why skimp */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1170 assert((size_t)itemsize <= sizeof(tmp));
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1171
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1172 if (Py_Size(self) > 1) {
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1173 for (p = self->ob_item,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1174 q = self->ob_item + (Py_Size(self) - 1)*itemsize;
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1175 p < q;
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1176 p += itemsize, q -= itemsize) {
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1177 /* memory areas guaranteed disjoint, so memcpy
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1178 * is safe (& memmove may be slower).
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1179 */
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1180 memcpy(tmp, p, itemsize);
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1181 memcpy(p, q, itemsize);
1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1182 memcpy(q, tmp, itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1183 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1184 }
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1185
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1186 Py_INCREF(Py_None);
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1187 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1188 }
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1189
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1190 PyDoc_STRVAR(reverse_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1191 "reverse()\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1192 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1193 Reverse the order of the items in the array.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1194
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1195
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1196 /* Forward */
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1197 static PyObject array_fromstring(arrayobject self, PyObject *args);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1198
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1199 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1200 array_fromfile(arrayobject self, PyObject args)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1201 {
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1202 PyObject f, b, *res;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1203 Py_ssize_t itemsize = self->ob_descr->itemsize;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1204 Py_ssize_t n, nbytes;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1205
36529 442c0fb3c4ed Use correct format specifier for Py_ssize_t variable to PyArg_ParseTuple(). Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	1206 if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1207 return NULL;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1208
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1209 nbytes = n * itemsize;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1210 if (nbytes < 0 \|\| nbytes/itemsize != n) {
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1211 PyErr_NoMemory();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1212 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1213 }
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1214
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1215 b = PyObject_CallMethod(f, "read", "n", nbytes);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1216 if (b == NULL)
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1217 return NULL;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1218
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1219 if (!PyBytes_Check(b)) {
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1220 PyErr_SetString(PyExc_TypeError,
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1221 "read() didn't return bytes");
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1222 Py_DECREF(b);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1223 return NULL;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1224 }
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1225
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1226 if (PyBytes_GET_SIZE(b) != nbytes) {
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1227 PyErr_SetString(PyExc_EOFError,
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1228 "read() didn't return enough bytes");
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1229 Py_DECREF(b);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1230 return NULL;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1231 }
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1232
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1233 args = Py_BuildValue("(O)", b);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1234 Py_DECREF(b);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1235 if (args == NULL)
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1236 return NULL;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1237
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1238 res = array_fromstring(self, args);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1239 Py_DECREF(args);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1240
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1241 return res;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1242 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1243
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1244 PyDoc_STRVAR(fromfile_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1245 "fromfile(f, n)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1246 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1247 Read n objects from the file object f and append them to the end of the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1248 array. Also called as read.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1249
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1250
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1251 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1252 array_tofile(arrayobject self, PyObject f)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1253 {
42335 c8b850b5a066 Fix merge breakage. Martin v. Löwis <martin@v.loewis.de> parents: 42334 diff changeset	1254 Py_ssize_t nbytes = Py_Size(self) * self->ob_descr->itemsize;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1255 /* Write 64K blocks at a time */
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1256 /* XXX Make the block size settable */
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1257 int BLOCKSIZE = 64*1024;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1258 Py_ssize_t nblocks = (nbytes + BLOCKSIZE - 1) / BLOCKSIZE;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1259 Py_ssize_t i;
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1260
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1261 if (Py_Size(self) == 0)
41434 f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1262 goto done;
f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1263
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1264 for (i = 0; i < nblocks; i++) {
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1265 char* ptr = self->ob_item + i*BLOCKSIZE;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1266 Py_ssize_t size = BLOCKSIZE;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1267 PyObject bytes, res;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1268 if (i*BLOCKSIZE + size > nbytes)
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1269 size = nbytes - i*BLOCKSIZE;
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1270 bytes = PyBytes_FromStringAndSize(ptr, size);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1271 if (bytes == NULL)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1272 return NULL;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1273 res = PyObject_CallMethod(f, "write", "O", bytes);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1274 Py_DECREF(bytes);
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1275 if (res == NULL)
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1276 return NULL;
42540 aab687936ecd Fix reference leak. Martin v. Löwis <martin@v.loewis.de> parents: 42335 diff changeset	1277 Py_DECREF(res); /* drop write result */
41434 f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1278 }
f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1279
f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1280 done:
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1281 Py_INCREF(Py_None);
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1282 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1283 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1284
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1285 PyDoc_STRVAR(tofile_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1286 "tofile(f)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1287 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1288 Write all items (as machine values) to the file object f. Also called as\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1289 write.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1290
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1291
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1292 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1293 array_fromlist(arrayobject self, PyObject list)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1294 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1295 Py_ssize_t n;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1296 Py_ssize_t itemsize = self->ob_descr->itemsize;
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1297
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1298 if (!PyList_Check(list)) {
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1299 PyErr_SetString(PyExc_TypeError, "arg must be list");
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1300 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1301 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1302 n = PyList_Size(list);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1303 if (n > 0) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1304 char *item = self->ob_item;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1305 Py_ssize_t i;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1306 PyMem_RESIZE(item, char, (Py_Size(self) + n) * itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1307 if (item == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1308 PyErr_NoMemory();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1309 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1310 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1311 self->ob_item = item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1312 Py_Size(self) += n;
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1313 self->allocated = Py_Size(self);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1314 for (i = 0; i < n; i++) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1315 PyObject *v = PyList_GetItem(list, i);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1316 if ((*self->ob_descr->setitem)(self,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1317 Py_Size(self) - n + i, v) != 0) {
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1318 Py_Size(self) -= n;
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1319 PyMem_RESIZE(item, char,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1320 Py_Size(self) * itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1321 self->ob_item = item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1322 self->allocated = Py_Size(self);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1323 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1324 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1325 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1326 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1327 Py_INCREF(Py_None);
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1328 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1329 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1330
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1331 PyDoc_STRVAR(fromlist_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1332 "fromlist(list)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1333 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1334 Append items to array from list.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1335
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1336 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1337 array_tolist(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1338 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1339 PyObject *list = PyList_New(Py_Size(self));
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1340 Py_ssize_t i;
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1341
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1342 if (list == NULL)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1343 return NULL;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1344 for (i = 0; i < Py_Size(self); i++) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1345 PyObject v = getarrayitem((PyObject )self, i);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1346 if (v == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1347 Py_DECREF(list);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1348 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1349 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1350 PyList_SetItem(list, i, v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1351 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1352 return list;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1353 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1354
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1355 PyDoc_STRVAR(tolist_doc,
9360 4c23ae6c6e82 ACK! There was still an unescaped newline in a docstring. Guido van Rossum <guido@python.org> parents: 9343 diff changeset	1356 "tolist() -> list\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1357 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1358 Convert array to an ordinary list with the same items.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1359
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1360
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1361 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1362 array_fromstring(arrayobject self, PyObject args)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1363 {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1364 char *str;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1365 Py_ssize_t n;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1366 int itemsize = self->ob_descr->itemsize;
13773 b6d93dba120e replaced PyArgs_Parse by PyArgs_ParseTuple Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13772 diff changeset	1367 if (!PyArg_ParseTuple(args, "s#:fromstring", &str, &n))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1368 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1369 if (n % itemsize != 0) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1370 PyErr_SetString(PyExc_ValueError,
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1371 "string length not a multiple of item size");
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1372 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1373 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1374 n = n / itemsize;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1375 if (n > 0) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1376 char *item = self->ob_item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1377 PyMem_RESIZE(item, char, (Py_Size(self) + n) * itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1378 if (item == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1379 PyErr_NoMemory();
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1380 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1381 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1382 self->ob_item = item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1383 Py_Size(self) += n;
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1384 self->allocated = Py_Size(self);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1385 memcpy(item + (Py_Size(self) - n) * itemsize,
4634 9facbab152cd Removed some unneeded header files and reedited with a fixed-width font Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4628 diff changeset	1386 str, itemsize*n);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1387 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1388 Py_INCREF(Py_None);
7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1389 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1390 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1391
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1392 PyDoc_STRVAR(fromstring_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1393 "fromstring(string)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1394 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1395 Appends items from the string, interpreting it as an array of machine\n\
42125 79c2656056f6 Make array.typecode a unicode string. Walter Dörwald <walter@livinglogic.de> parents: 42112 diff changeset	1396 values, as if it had been read from a file using the fromfile() method).");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1397
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1398
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1399 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1400 array_tostring(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1401 {
42112 ebc87b94e6ea "Fix" the array module test -- by ripping out the 'c' typecode. Guido van Rossum <guido@python.org> parents: 41859 diff changeset	1402 return PyBytes_FromStringAndSize(self->ob_item,
42335 c8b850b5a066 Fix merge breakage. Martin v. Löwis <martin@v.loewis.de> parents: 42334 diff changeset	1403 Py_Size(self) * self->ob_descr->itemsize);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1404 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1405
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1406 PyDoc_STRVAR(tostring_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1407 "tostring() -> string\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1408 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1409 Convert the array to an array of machine values and return the string\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1410 representation.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1411
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1412
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1413
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1414 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1415 array_fromunicode(arrayobject self, PyObject args)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1416 {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1417 Py_UNICODE *ustr;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1418 Py_ssize_t n;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1419
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1420 if (!PyArg_ParseTuple(args, "u#:fromunicode", &ustr, &n))
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1421 return NULL;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1422 if (self->ob_descr->typecode != PyArr_UNI) {
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1423 PyErr_SetString(PyExc_ValueError,
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1424 "fromunicode() may only be called on "
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1425 "unicode type arrays");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1426 return NULL;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1427 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1428 if (n > 0) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1429 Py_UNICODE item = (Py_UNICODE ) self->ob_item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1430 PyMem_RESIZE(item, Py_UNICODE, Py_Size(self) + n);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1431 if (item == NULL) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1432 PyErr_NoMemory();
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1433 return NULL;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1434 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1435 self->ob_item = (char *) item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1436 Py_Size(self) += n;
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1437 self->allocated = Py_Size(self);
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1438 memcpy(item + Py_Size(self) - n,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1439 ustr, n * sizeof(Py_UNICODE));
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1440 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1441
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1442 Py_INCREF(Py_None);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1443 return Py_None;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1444 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1445
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1446 PyDoc_STRVAR(fromunicode_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1447 "fromunicode(ustr)\n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1448 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1449 Extends this array with data from the unicode string ustr.\n\
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1450 The array must be a unicode type array; otherwise a ValueError\n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1451 is raised. Use array.fromstring(ustr.decode(...)) to\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1452 append Unicode data to an array of some other type.");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1453
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1454
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1455 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1456 array_tounicode(arrayobject self, PyObject unused)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1457 {
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1458 if (self->ob_descr->typecode != PyArr_UNI) {
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1459 PyErr_SetString(PyExc_ValueError,
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1460 "tounicode() may only be called on unicode type arrays");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1461 return NULL;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1462 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1463 return PyUnicode_FromUnicode((Py_UNICODE *) self->ob_item, Py_Size(self));
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1464 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1465
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1466 PyDoc_STRVAR(tounicode_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1467 "tounicode() -> unicode\n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1468 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1469 Convert the array to a unicode string. The array must be\n\
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1470 a unicode type array; otherwise a ValueError is raised. Use\n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1471 array.tostring().decode() to obtain a unicode string from\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1472 an array of some other type.");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1473
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1474
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1475
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1476 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1477 array_get_typecode(arrayobject a, void closure)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1478 {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1479 char tc = a->ob_descr->typecode;
42125 79c2656056f6 Make array.typecode a unicode string. Walter Dörwald <walter@livinglogic.de> parents: 42112 diff changeset	1480 return PyUnicode_FromStringAndSize(&tc, 1);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1481 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1482
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1483 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1484 array_get_itemsize(arrayobject a, void closure)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1485 {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1486 return PyInt_FromLong((long)a->ob_descr->itemsize);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1487 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1488
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1489 static PyGetSetDef array_getsets [] = {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1490 {"typecode", (getter) array_get_typecode, NULL,
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1491 "the typecode character used to create the array"},
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1492 {"itemsize", (getter) array_get_itemsize, NULL,
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1493 "the size, in bytes, of one array item"},
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1494 {NULL}
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1495 };
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1496
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1497 PyMethodDef array_methods[] = {
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1498 {"append", (PyCFunction)array_append, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1499 append_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1500 {"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1501 buffer_info_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1502 {"byteswap", (PyCFunction)array_byteswap, METH_NOARGS,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1503 byteswap_doc},
31651 35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	1504 {"__copy__", (PyCFunction)array_copy, METH_NOARGS,
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	1505 copy_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1506 {"count", (PyCFunction)array_count, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1507 count_doc},
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1508 {"__deepcopy__",(PyCFunction)array_copy, METH_O,
31651 35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	1509 copy_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1510 {"extend", (PyCFunction)array_extend, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1511 extend_doc},
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1512 {"fromfile", (PyCFunction)array_fromfile, METH_VARARGS,
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1513 fromfile_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1514 {"fromlist", (PyCFunction)array_fromlist, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1515 fromlist_doc},
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1516 {"fromstring", (PyCFunction)array_fromstring, METH_VARARGS,
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1517 fromstring_doc},
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1518 {"fromunicode", (PyCFunction)array_fromunicode, METH_VARARGS,
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1519 fromunicode_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1520 {"index", (PyCFunction)array_index, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1521 index_doc},
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1522 {"insert", (PyCFunction)array_insert, METH_VARARGS,
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1523 insert_doc},
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1524 {"pop", (PyCFunction)array_pop, METH_VARARGS,
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1525 pop_doc},
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1526 {"read", (PyCFunction)array_fromfile, METH_VARARGS,
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1527 fromfile_doc},
34174 30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1528 {"__reduce__", (PyCFunction)array_reduce, METH_NOARGS,
30b97c1bb12d SF #1085304: Make array.array pickle-able Raymond Hettinger <python@rcn.com> parents: 33316 diff changeset	1529 array_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1530 {"remove", (PyCFunction)array_remove, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1531 remove_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1532 {"reverse", (PyCFunction)array_reverse, METH_NOARGS,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1533 reverse_doc},
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1534 /* {"sort", (PyCFunction)array_sort, METH_VARARGS,
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1535 sort_doc},*/
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1536 {"tofile", (PyCFunction)array_tofile, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1537 tofile_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1538 {"tolist", (PyCFunction)array_tolist, METH_NOARGS,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1539 tolist_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1540 {"tostring", (PyCFunction)array_tostring, METH_NOARGS,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1541 tostring_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1542 {"tounicode", (PyCFunction)array_tounicode, METH_NOARGS,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1543 tounicode_doc},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1544 {"write", (PyCFunction)array_tofile, METH_O,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1545 tofile_doc},
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1546 {NULL, NULL} /* sentinel */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1547 };
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1548
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1549 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1550 array_repr(arrayobject *a)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1551 {
41788 00413f70ce5c Remove unused variables. Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	1552 char typecode;
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	1553 PyObject s, v = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1554 Py_ssize_t len;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1555
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1556 len = Py_Size(a);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1557 typecode = a->ob_descr->typecode;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1558 if (len == 0) {
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	1559 return PyUnicode_FromFormat("array('%c')", typecode);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1560 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1561 if (typecode == PyArr_UNI)
28742 bd678e65f784 SF Patch 685051: fix for 680789: reprs in arraymodule Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	1562 v = array_tounicode(a, NULL);
bd678e65f784 SF Patch 685051: fix for 680789: reprs in arraymodule Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	1563 else
bd678e65f784 SF Patch 685051: fix for 680789: reprs in arraymodule Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	1564 v = array_tolist(a, NULL);
bd678e65f784 SF Patch 685051: fix for 680789: reprs in arraymodule Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	1565
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	1566 s = PyUnicode_FromFormat("array('%c', %R)", typecode, v);
bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	1567 Py_DECREF(v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1568 return s;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1569 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1570
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1571 static PyObject*
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1572 array_subscr(arrayobject* self, PyObject* item)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1573 {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	1574 if (PyIndex_Check(item)) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	1575 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1576 if (i==-1 && PyErr_Occurred()) {
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1577 return NULL;
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1578 }
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1579 if (i < 0)
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1580 i += Py_Size(self);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1581 return array_item(self, i);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1582 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1583 else if (PySlice_Check(item)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1584 Py_ssize_t start, stop, step, slicelength, cur, i;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1585 PyObject* result;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1586 arrayobject* ar;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1587 int itemsize = self->ob_descr->itemsize;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1588
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1589 if (PySlice_GetIndicesEx((PySliceObject*)item, Py_Size(self),
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1590 &start, &stop, &step, &slicelength) < 0) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1591 return NULL;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1592 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1593
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1594 if (slicelength <= 0) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1595 return newarrayobject(&Arraytype, 0, self->ob_descr);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1596 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1597 else {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1598 result = newarrayobject(&Arraytype, slicelength, self->ob_descr);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1599 if (!result) return NULL;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1600
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1601 ar = (arrayobject*)result;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1602
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1603 for (cur = start, i = 0; i < slicelength;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1604 cur += step, i++) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1605 memcpy(ar->ob_item + i*itemsize,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1606 self->ob_item + cur*itemsize,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1607 itemsize);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1608 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1609
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1610 return result;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1611 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1612 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1613 else {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1614 PyErr_SetString(PyExc_TypeError,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1615 "list indices must be integers");
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1616 return NULL;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1617 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1618 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1619
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1620 static int
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1621 array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1622 {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	1623 if (PyIndex_Check(item)) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	1624 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1625 if (i==-1 && PyErr_Occurred())
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1626 return -1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1627 if (i < 0)
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1628 i += Py_Size(self);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1629 return array_ass_item(self, i, value);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1630 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1631 else if (PySlice_Check(item)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1632 Py_ssize_t start, stop, step, slicelength;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1633 int itemsize = self->ob_descr->itemsize;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1634
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1635 if (PySlice_GetIndicesEx((PySliceObject*)item, Py_Size(self),
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1636 &start, &stop, &step, &slicelength) < 0) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1637 return -1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1638 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1639
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1640 /* treat A[slice(a,b)] = v _exactly_ like A[a:b] = v */
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1641 if (step == 1 && ((PySliceObject*)item)->step == Py_None)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1642 return array_ass_slice(self, start, stop, value);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1643
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1644 if (value == NULL) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1645 /* delete slice */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1646 Py_ssize_t cur, i, extra;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1647
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1648 if (slicelength <= 0)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1649 return 0;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1650
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1651 if (step < 0) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1652 stop = start + 1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1653 start = stop + step*(slicelength - 1) - 1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1654 step = -step;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1655 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1656
24424 f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24283 diff changeset	1657 for (cur = start, i = 0; i < slicelength - 1;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1658 cur += step, i++) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1659 memmove(self->ob_item + (cur - i)*itemsize,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1660 self->ob_item + (cur + 1)*itemsize,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1661 (step - 1) * itemsize);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1662 }
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1663 extra = Py_Size(self) - (cur + 1);
24424 f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24283 diff changeset	1664 if (extra > 0) {
f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24283 diff changeset	1665 memmove(self->ob_item + (cur - i)*itemsize,
f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24283 diff changeset	1666 self->ob_item + (cur + 1)*itemsize,
f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24283 diff changeset	1667 extra*itemsize);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1668 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1669
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1670 Py_Size(self) -= slicelength;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1671 self->ob_item = (char *)PyMem_REALLOC(self->ob_item,
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1672 itemsize*Py_Size(self));
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1673 self->allocated = Py_Size(self);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1674
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1675 return 0;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1676 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1677 else {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1678 /* assign slice */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1679 Py_ssize_t cur, i;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1680 arrayobject* av;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1681
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1682 if (!array_Check(value)) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1683 PyErr_Format(PyExc_TypeError,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1684 "must assign array (not \"%.200s\") to slice",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1685 Py_Type(value)->tp_name);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1686 return -1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1687 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1688
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1689 av = (arrayobject*)value;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1690
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1691 if (Py_Size(av) != slicelength) {
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1692 PyErr_Format(PyExc_ValueError,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1693 "attempt to assign array of size %ld to extended slice of size %ld",
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1694 /XXX/(long)Py_Size(av), /XXX/(long)slicelength);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1695 return -1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1696 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1697
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1698 if (!slicelength)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1699 return 0;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1700
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1701 /* protect against a[::-1] = a */
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1702 if (self == av) {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1703 value = array_slice(av, 0, Py_Size(av));
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1704 av = (arrayobject*)value;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	1705 if (!av)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	1706 return -1;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1707 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1708 else {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1709 Py_INCREF(value);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1710 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1711
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1712 for (cur = start, i = 0; i < slicelength;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1713 cur += step, i++) {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1714 memcpy(self->ob_item + cur*itemsize,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1715 av->ob_item + i*itemsize,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1716 itemsize);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1717 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1718
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1719 Py_DECREF(value);
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1720
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1721 return 0;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1722 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1723 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1724 else {
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1725 PyErr_SetString(PyExc_TypeError,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1726 "list indices must be integers");
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1727 return -1;
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1728 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1729 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1730
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1731 static PyMappingMethods array_as_mapping = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1732 (lenfunc)array_length,
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1733 (binaryfunc)array_subscr,
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1734 (objobjargproc)array_ass_subscr
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1735 };
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	1736
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1737 static const void *emptybuf = "";
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	1738
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1739
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1740 static int
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1741 array_buffer_getbuf(arrayobject self, PyBuffer view, int flags)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1742 {
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1743 if ((flags & PyBUF_CHARACTER)) {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1744 PyErr_SetString(PyExc_TypeError,
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1745 "Cannot be a character buffer");
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1746 return -1;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1747 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1748 if ((flags & PyBUF_LOCKDATA)) {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1749 PyErr_SetString(PyExc_BufferError,
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1750 "Cannot lock data");
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1751 return -1;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1752 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1753 if (view==NULL) goto finish;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1754
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1755 view->buf = (void *)self->ob_item;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1756 if (view->buf == NULL)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1757 view->buf = (void *)emptybuf;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1758 view->len = (Py_Size(self)) * self->ob_descr->itemsize;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1759 view->readonly = 0;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1760 view->ndim = 1;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1761 view->itemsize = self->ob_descr->itemsize;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1762 view->suboffsets = NULL;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1763 view->shape = NULL;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1764 if ((flags & PyBUF_ND)==PyBUF_ND) {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1765 view->shape = &((Py_Size(self)));
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1766 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1767 view->strides = NULL;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1768 if ((flags & PyBUF_STRIDES)==PyBUF_STRIDES)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1769 view->strides = &(view->itemsize);
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1770 view->format = NULL;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1771 view->internal = NULL;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1772 if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1773 view->internal = malloc(3);
42669 2c51be9904de Code review of the new buffer protocol. Mostly add questions that should Neal Norwitz <nnorwitz@gmail.com> parents: 42665 diff changeset	1774 /* XXX(nnorwitz): need to check for malloc failure.
2c51be9904de Code review of the new buffer protocol. Mostly add questions that should Neal Norwitz <nnorwitz@gmail.com> parents: 42665 diff changeset	1775 Should probably use PyObject_Malloc. */
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1776 view->format = view->internal;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1777 view->format[0] = (char)(self->ob_descr->typecode);
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1778 view->format[1] = '\0';
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1779 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1780
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1781 finish:
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1782 self->ob_exports++;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1783 return 0;
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1784 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1785
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1786 static void
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1787 array_buffer_relbuf(arrayobject self, PyBuffer view)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1788 {
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1789 free(view->internal);
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1790 self->ob_exports--;
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1791 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1792
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1793 static PySequenceMethods array_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1794 (lenfunc)array_length, /sq_length/
4634 9facbab152cd Removed some unneeded header files and reedited with a fixed-width font Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4628 diff changeset	1795 (binaryfunc)array_concat, /sq_concat/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1796 (ssizeargfunc)array_repeat, /sq_repeat/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1797 (ssizeargfunc)array_item, /sq_item/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1798 (ssizessizeargfunc)array_slice, /sq_slice/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1799 (ssizeobjargproc)array_ass_item, /sq_ass_item/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1800 (ssizessizeobjargproc)array_ass_slice, /sq_ass_slice/
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	1801 (objobjproc)array_contains, /sq_contains/
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1802 (binaryfunc)array_inplace_concat, /sq_inplace_concat/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1803 (ssizeargfunc)array_inplace_repeat /sq_inplace_repeat/
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1804 };
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1805
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1806 static PyBufferProcs array_as_buffer = {
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1807 (getbufferproc)array_buffer_getbuf,
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1808 (releasebufferproc)array_buffer_relbuf
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1809 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	1810
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1811 static PyObject *
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1812 array_new(PyTypeObject type, PyObject args, PyObject *kwds)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1813 {
42136 78bc078c7350 Fix a failure that was only apparent on big-endian machines: Guido van Rossum <guido@python.org> parents: 42125 diff changeset	1814 int c;
33316 0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1815 PyObject initial = NULL, it = NULL;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1816 struct arraydescr *descr;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34174 diff changeset	1817
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	1818 if (type == &Arraytype && !_PyArg_NoKeywords("array.array()", kwds))
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34174 diff changeset	1819 return NULL;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1820
42139 1f7b66a9ffb0 Revert r56044 (which changed the %c format specifier to accept a Walter Dörwald <walter@livinglogic.de> parents: 42136 diff changeset	1821 if (!PyArg_ParseTuple(args, "C\|O:array", &c, &initial))
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1822 return NULL;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1823
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1824 if (!(initial == NULL \|\| PyList_Check(initial)
42145 8eeaa9923901 Creating an array with a bytes object as initializer Guido van Rossum <guido@python.org> parents: 42139 diff changeset	1825 \|\| PyBytes_Check(initial)
28760 22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	1826 \|\| PyString_Check(initial) \|\| PyTuple_Check(initial)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1827 \|\| (c == PyArr_UNI && PyUnicode_Check(initial)))) {
33316 0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1828 it = PyObject_GetIter(initial);
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1829 if (it == NULL)
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1830 return NULL;
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1831 /* We set initial to NULL so that the subsequent code
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1832 will create an empty array of the appropriate type
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1833 and afterwards we can use array_iter_extend to populate
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1834 the array.
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1835 */
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1836 initial = NULL;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1837 }
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1838 for (descr = descriptors; descr->typecode != '\0'; descr++) {
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1839 if (descr->typecode == c) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1840 PyObject *a;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1841 Py_ssize_t len;
28760 22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	1842
22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	1843 if (initial == NULL \|\| !(PyList_Check(initial)
22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	1844 \|\| PyTuple_Check(initial)))
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1845 len = 0;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1846 else
28760 22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	1847 len = PySequence_Size(initial);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1848
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1849 a = newarrayobject(type, len, descr);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1850 if (a == NULL)
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1851 return NULL;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1852
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1853 if (len > 0) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1854 Py_ssize_t i;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1855 for (i = 0; i < len; i++) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1856 PyObject *v =
28760 22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	1857 PySequence_GetItem(initial, i);
30066 ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1858 if (v == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1859 Py_DECREF(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1860 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1861 }
30066 ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1862 if (setarrayitem(a, i, v) != 0) {
ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1863 Py_DECREF(v);
ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1864 Py_DECREF(a);
ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1865 return NULL;
ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1866 }
ae0242e3459e SF bug #782369: Massive memory leak in array module Raymond Hettinger <python@rcn.com> parents: 29244 diff changeset	1867 Py_DECREF(v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1868 }
42145 8eeaa9923901 Creating an array with a bytes object as initializer Guido van Rossum <guido@python.org> parents: 42139 diff changeset	1869 } else if (initial != NULL &&
8eeaa9923901 Creating an array with a bytes object as initializer Guido van Rossum <guido@python.org> parents: 42139 diff changeset	1870 (PyString_Check(initial) \|\| PyBytes_Check(initial))) {
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1871 PyObject t_initial, v;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1872 t_initial = PyTuple_Pack(1, initial);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1873 if (t_initial == NULL) {
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1874 Py_DECREF(a);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1875 return NULL;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1876 }
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36689 diff changeset	1877 v = array_fromstring((arrayobject *)a,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1878 t_initial);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1879 Py_DECREF(t_initial);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1880 if (v == NULL) {
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1881 Py_DECREF(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1882 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1883 }
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1884 Py_DECREF(v);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1885 } else if (initial != NULL && PyUnicode_Check(initial)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1886 Py_ssize_t n = PyUnicode_GET_DATA_SIZE(initial);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1887 if (n > 0) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1888 arrayobject self = (arrayobject )a;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1889 char *item = self->ob_item;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1890 item = (char *)PyMem_Realloc(item, n);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1891 if (item == NULL) {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1892 PyErr_NoMemory();
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1893 Py_DECREF(a);
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1894 return NULL;
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1895 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1896 self->ob_item = item;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1897 Py_Size(self) = n / sizeof(Py_UNICODE);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1898 memcpy(item, PyUnicode_AS_DATA(initial), n);
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1899 self->allocated = Py_Size(self);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1900 }
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1901 }
33316 0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1902 if (it != NULL) {
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1903 if (array_iter_extend((arrayobject *)a, it) == -1) {
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1904 Py_DECREF(it);
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1905 Py_DECREF(a);
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1906 return NULL;
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1907 }
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1908 Py_DECREF(it);
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1909 }
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1910 return a;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1911 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1912 }
4634 9facbab152cd Removed some unneeded header files and reedited with a fixed-width font Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4628 diff changeset	1913 PyErr_SetString(PyExc_ValueError,
42112 ebc87b94e6ea "Fix" the array module test -- by ripping out the 'c' typecode. Guido van Rossum <guido@python.org> parents: 41859 diff changeset	1914 "bad typecode (must be b, B, u, h, H, i, I, l, L, f or d)");
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1915 return NULL;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1916 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1917
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1918
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1919 PyDoc_STRVAR(module_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1920 "This module defines an object type which can efficiently represent\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1921 an array of basic values: characters, integers, floating point\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1922 numbers. Arrays are sequence types and behave very much like lists,\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1923 except that the type of objects stored in them is constrained. The\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1924 type is specified at object creation time by using a type code, which\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1925 is a single character. The following type codes are defined:\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1926 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1927 Type code C Type Minimum size in bytes \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1928 'b' signed integer 1 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1929 'B' unsigned integer 1 \n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1930 'u' Unicode character 2 \n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1931 'h' signed integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1932 'H' unsigned integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1933 'i' signed integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1934 'I' unsigned integer 2 \n\
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42540 diff changeset	1935 'w' unicode character 4 \n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1936 'l' signed integer 4 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1937 'L' unsigned integer 4 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1938 'f' floating point 4 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1939 'd' floating point 8 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1940 \n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1941 The constructor is:\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1942 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1943 array(typecode [, initializer]) -- create a new array\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1944 ");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1945
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1946 PyDoc_STRVAR(arraytype_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1947 "array(typecode [, initializer]) -> array\n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1948 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1949 Return a new array whose items are restricted by typecode, and\n\
33316 0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1950 initialized from the optional initializer value, which must be a list,\n\
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	1951 string. or iterable over elements of the appropriate type.\n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1952 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1953 Arrays represent basic values and behave very much like lists, except\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1954 the type of objects stored in them is constrained.\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1955 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1956 Methods:\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1957 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1958 append() -- append a new item to the end of the array\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1959 buffer_info() -- return information giving the current memory info\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1960 byteswap() -- byteswap all the items of the array\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1961 count() -- return number of occurences of an object\n\
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	1962 extend() -- extend array by appending multiple elements from an iterable\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1963 fromfile() -- read items from a file object\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1964 fromlist() -- append items from the list\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1965 fromstring() -- append items from the string\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1966 index() -- return index of first occurence of an object\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1967 insert() -- insert a new item into the array at a provided position\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1968 pop() -- remove and return item (default last)\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1969 read() -- DEPRECATED, use fromfile()\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1970 remove() -- remove first occurence of an object\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1971 reverse() -- reverse the order of the items in the array\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1972 tofile() -- write all items to a file object\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1973 tolist() -- return the array converted to an ordinary list\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1974 tostring() -- return the array converted to a string\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1975 write() -- DEPRECATED, use tofile()\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1976 \n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1977 Attributes:\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1978 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1979 typecode -- the typecode character used to create the array\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1980 itemsize -- the length in bytes of one array item\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1981 ");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1982
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	1983 static PyObject array_iter(arrayobject ao);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	1984
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1985 static PyTypeObject Arraytype = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1986 PyVarObject_HEAD_INIT(NULL, 0)
21313 91dd223829c6 Patch supplied by Burton Radons for his own SF bug #487390: Modifying Guido van Rossum <guido@python.org> parents: 21073 diff changeset	1987 "array.array",
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1988 sizeof(arrayobject),
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1989 0,
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1990 (destructor)array_dealloc, /* tp_dealloc */
22124 edf05c69bbf3 Remove tp_print. Martin v. Löwis <martin@v.loewis.de> parents: 22098 diff changeset	1991 0, /* tp_print */
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1992 0, /* tp_getattr */
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1993 0, /* tp_setattr */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1994 0, /* tp_compare */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1995 (reprfunc)array_repr, /* tp_repr */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1996 0, /* tp_as_number*/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1997 &array_as_sequence, /* tp_as_sequence*/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1998 &array_as_mapping, /* tp_as_mapping*/
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	1999 0, /* tp_hash */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2000 0, /* tp_call */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2001 0, /* tp_str */
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27044 diff changeset	2002 PyObject_GenericGetAttr, /* tp_getattro */
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2003 0, /* tp_setattro */
18036 a02085871c3f Make it possible to find the use of tp_as_buffer here with a global search. Tim Peters <tim.peters@gmail.com> parents: 16268 diff changeset	2004 &array_as_buffer, /* tp_as_buffer*/
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	2005 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2006 arraytype_doc, /* tp_doc */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2007 0, /* tp_traverse */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2008 0, /* tp_clear */
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	2009 array_richcompare, /* tp_richcompare */
32159 2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	2010 offsetof(arrayobject, weakreflist), /* tp_weaklistoffset */
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2011 (getiterfunc)array_iter, /* tp_iter */
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2012 0, /* tp_iternext */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2013 array_methods, /* tp_methods */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2014 0, /* tp_members */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2015 array_getsets, /* tp_getset */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2016 0, /* tp_base */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2017 0, /* tp_dict */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2018 0, /* tp_descr_get */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2019 0, /* tp_descr_set */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2020 0, /* tp_dictoffset */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2021 0, /* tp_init */
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27044 diff changeset	2022 PyType_GenericAlloc, /* tp_alloc */
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2023 array_new, /* tp_new */
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27044 diff changeset	2024 PyObject_Del, /* tp_free */
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2025 };
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2026
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2027
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2028 /********************* Array Iterator ************************/
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2029
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2030 typedef struct {
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2031 PyObject_HEAD
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	2032 Py_ssize_t index;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2033 arrayobject *ao;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	2034 PyObject * (getitem)(struct arrayobject , Py_ssize_t);
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2035 } arrayiterobject;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2036
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2037 static PyTypeObject PyArrayIter_Type;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2038
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2039 #define PyArrayIter_Check(op) PyObject_TypeCheck(op, &PyArrayIter_Type)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2040
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2041 static PyObject *
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2042 array_iter(arrayobject *ao)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2043 {
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2044 arrayiterobject *it;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2045
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2046 if (!array_Check(ao)) {
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2047 PyErr_BadInternalCall();
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2048 return NULL;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2049 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2050
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2051 it = PyObject_GC_New(arrayiterobject, &PyArrayIter_Type);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2052 if (it == NULL)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2053 return NULL;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2054
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2055 Py_INCREF(ao);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2056 it->ao = ao;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2057 it->index = 0;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2058 it->getitem = ao->ob_descr->getitem;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2059 PyObject_GC_Track(it);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2060 return (PyObject *)it;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2061 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2062
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2063 static PyObject *
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2064 arrayiter_next(arrayiterobject *it)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2065 {
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2066 assert(PyArrayIter_Check(it));
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	2067 if (it->index < Py_Size(it->ao))
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2068 return (*it->getitem)(it->ao, it->index++);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2069 return NULL;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2070 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2071
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2072 static void
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2073 arrayiter_dealloc(arrayiterobject *it)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2074 {
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2075 PyObject_GC_UnTrack(it);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2076 Py_XDECREF(it->ao);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2077 PyObject_GC_Del(it);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2078 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2079
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2080 static int
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2081 arrayiter_traverse(arrayiterobject it, visitproc visit, void arg)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2082 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	2083 Py_VISIT(it->ao);
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2084 return 0;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2085 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2086
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2087 static PyTypeObject PyArrayIter_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	2088 PyVarObject_HEAD_INIT(NULL, 0)
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2089 "arrayiterator", /* tp_name */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2090 sizeof(arrayiterobject), /* tp_basicsize */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2091 0, /* tp_itemsize */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2092 /* methods */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2093 (destructor)arrayiter_dealloc, /* tp_dealloc */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2094 0, /* tp_print */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2095 0, /* tp_getattr */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2096 0, /* tp_setattr */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2097 0, /* tp_compare */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2098 0, /* tp_repr */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2099 0, /* tp_as_number */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2100 0, /* tp_as_sequence */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2101 0, /* tp_as_mapping */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2102 0, /* tp_hash */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2103 0, /* tp_call */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2104 0, /* tp_str */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2105 PyObject_GenericGetAttr, /* tp_getattro */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2106 0, /* tp_setattro */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2107 0, /* tp_as_buffer */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2108 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2109 0, /* tp_doc */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2110 (traverseproc)arrayiter_traverse, /* tp_traverse */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2111 0, /* tp_clear */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2112 0, /* tp_richcompare */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2113 0, /* tp_weaklistoffset */
28320 fd5ef7003469 Renamed PyObject_GenericGetIter to PyObject_SelfIter Raymond Hettinger <python@rcn.com> parents: 28309 diff changeset	2114 PyObject_SelfIter, /* tp_iter */
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2115 (iternextfunc)arrayiter_next, /* tp_iternext */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2116 0, /* tp_methods */
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2117 };
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2118
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2119
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2120 /********************* Install Module ************************/
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2121
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2122 /* No functions in array module. */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2123 static PyMethodDef a_methods[] = {
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2124 {NULL, NULL, 0, NULL} /* Sentinel */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2125 };
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2126
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2127
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24424 diff changeset	2128 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13590 diff changeset	2129 initarray(void)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2130 {
22722 ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2131 PyObject *m;
11711 6546ea06e157 Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>: Fred Drake <fdrake@acm.org> parents: 11673 diff changeset	2132
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	2133 if (PyType_Ready(&Arraytype) < 0)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	2134 return;
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	2135 Py_Type(&PyArrayIter_Type) = &PyType_Type;
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2136 m = Py_InitModule3("array", a_methods, module_doc);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35449 diff changeset	2137 if (m == NULL)
1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35449 diff changeset	2138 return;
22722 ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2139
ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2140 Py_INCREF((PyObject *)&Arraytype);
ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2141 PyModule_AddObject(m, "ArrayType", (PyObject *)&Arraytype);
ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2142 Py_INCREF((PyObject *)&Arraytype);
ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2143 PyModule_AddObject(m, "array", (PyObject *)&Arraytype);
9362 50e0631cf117 No need to issue a fatal error if the PyDict_SetItemString fails; the Guido van Rossum <guido@python.org> parents: 9360 diff changeset	2144 /* No need to check the error here, the caller will do that */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2145 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/arraymodule.c @ 42669:2c51be9904de