mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-28298: make array 'Q', 'L' and 'I' accept big intables as elements (#570)

Browse source
This commit is contained in:
orenmn 2017-03-09 11:35:28 +02:00 • committed by Serhiy Storchaka
parent 22e707fa04
commit 964281af59
3 changed files with 91 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

112
Modules/arraymodule.c
View file

@ -331,35 +331,51 @@ II_getitem(arrayobject *ap, Py_ssize_t i)
(unsigned long) ((unsigned int *)ap->ob_item)[i]);
}
static PyObject *
get_int_unless_float(PyObject *v)
{
if (PyFloat_Check(v)) {
PyErr_SetString(PyExc_TypeError,
"array item must be integer");
return NULL;
}
return (PyObject *)_PyLong_FromNbInt(v);
}
static int
II_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
{
unsigned long x;
if (PyLong_Check(v)) {
x = PyLong_AsUnsignedLong(v);
if (x == (unsigned long) -1 && PyErr_Occurred())
return -1;
}
else {
long y;
if (!PyArg_Parse(v, "l;array item must be integer", &y))
return -1;
if (y < 0) {
PyErr_SetString(PyExc_OverflowError,
"unsigned int is less than minimum");
int do_decref = 0; /* if nb_int was called */
if (!PyLong_Check(v)) {
v = get_int_unless_float(v);
if (NULL == v) {
return -1;
}
x = (unsigned long)y;
do_decref = 1;
}
x = PyLong_AsUnsignedLong(v);
if (x == (unsigned long)-1 && PyErr_Occurred()) {
if (do_decref) {
Py_DECREF(v);
}
return -1;
}
if (x > UINT_MAX) {
PyErr_SetString(PyExc_OverflowError,
"unsigned int is greater than maximum");
"unsigned int is greater than maximum");
if (do_decref) {
Py_DECREF(v);
}
return -1;
}
if (i >= 0)
((unsigned int *)ap->ob_item)[i] = (unsigned int)x;
if (do_decref) {
Py_DECREF(v);
}
return 0;
}
@ -390,31 +406,28 @@ static int
LL_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
{
unsigned long x;
if (PyLong_Check(v)) {
x = PyLong_AsUnsignedLong(v);
if (x == (unsigned long) -1 && PyErr_Occurred())
return -1;
}
else {
long y;
if (!PyArg_Parse(v, "l;array item must be integer", &y))
return -1;
if (y < 0) {
PyErr_SetString(PyExc_OverflowError,
"unsigned long is less than minimum");
int do_decref = 0; /* if nb_int was called */
if (!PyLong_Check(v)) {
v = get_int_unless_float(v);
if (NULL == v) {
return -1;
}
x = (unsigned long)y;
do_decref = 1;
}
if (x > ULONG_MAX) {
PyErr_SetString(PyExc_OverflowError,
"unsigned long is greater than maximum");
x = PyLong_AsUnsignedLong(v);
if (x == (unsigned long)-1 && PyErr_Occurred()) {
if (do_decref) {
Py_DECREF(v);
}
return -1;
}
if (i >= 0)
((unsigned long *)ap->ob_item)[i] = x;
if (do_decref) {
Py_DECREF(v);
}
return 0;
}
@ -446,25 +459,28 @@ static int
QQ_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
{
unsigned long long x;
if (PyLong_Check(v)) {
x = PyLong_AsUnsignedLongLong(v);
if (x == (unsigned long long) -1 && PyErr_Occurred())
return -1;
}
else {
long long y;
if (!PyArg_Parse(v, "L;array item must be integer", &y))
return -1;
if (y < 0) {
PyErr_SetString(PyExc_OverflowError,
"unsigned long long is less than minimum");
int do_decref = 0; /* if nb_int was called */
if (!PyLong_Check(v)) {
v = get_int_unless_float(v);
if (NULL == v) {
return -1;
}
x = (unsigned long long)y;
do_decref = 1;
}
x = PyLong_AsUnsignedLongLong(v);
if (x == (unsigned long long)-1 && PyErr_Occurred()) {
if (do_decref) {
Py_DECREF(v);
}
return -1;
}
if (i >= 0)
((unsigned long long *)ap->ob_item)[i] = x;
if (do_decref) {
Py_DECREF(v);
}
return 0;
}