Skip to content

bpo-27867: Expand the PySlice_GetIndicesEx macro. (#1023) #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 2 commits into from
Apr 8, 2017
Merged

bpo-27867: Expand the PySlice_GetIndicesEx macro. (#1023) #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e9ae6
bpo-27867: Expand the PySlice_GetIndicesEx macro. (#1023)
serhiy-storchaka Apr 8, 2017
6a41f0a
In 2.7 names _PySlice_Unpack and _PySlice_AdjustIndices are underscored.
serhiy-storchaka Apr 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4613,11 +4613,10 @@ Array_ass_subscript(PyObject *_self, PyObject *item, PyObject *value)
else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelen, otherlen, i, cur;

if (PySlice_GetIndicesEx((PySliceObject *)item,
self->b_length, &start, &stop,
&step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return -1;
}
slicelen = _PySlice_AdjustIndices(self->b_length, &start, &stop, step);
if ((step < 0 && start < stop) ||
(step > 0 && start > stop))
stop = start;
Expand Down
12 changes: 6 additions & 6 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,11 +1334,11 @@ element_subscr(PyObject* self_, PyObject* item)
if (!self->extra)
return PyList_New(0);

if (PySlice_GetIndicesEx((PySliceObject *)item,
self->extra->length,
&start, &stop, &step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelen = _PySlice_AdjustIndices(self->extra->length, &start, &stop,
step);

if (slicelen <= 0)
return PyList_New(0);
Expand Down Expand Up @@ -1393,11 +1393,11 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value)
if (!self->extra)
element_new_extra(self, NULL);

if (PySlice_GetIndicesEx((PySliceObject *)item,
self->extra->length,
&start, &stop, &step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return -1;
}
slicelen = _PySlice_AdjustIndices(self->extra->length, &start, &stop,
step);
assert(slicelen <= self->extra->length);

if (value == NULL)
Expand Down
11 changes: 6 additions & 5 deletions Modules/arraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,10 +1701,11 @@ array_subscr(arrayobject* self, PyObject* item)
arrayobject* ar;
int itemsize = self->ob_descr->itemsize;

if (PySlice_GetIndicesEx((PySliceObject*)item, Py_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
step);

if (slicelength <= 0) {
return newarrayobject(&Arraytype, 0, self->ob_descr);
Expand Down Expand Up @@ -1772,11 +1773,11 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
return (*self->ob_descr->setitem)(self, i, value);
}
else if (PySlice_Check(item)) {
if (PySlice_GetIndicesEx((PySliceObject *)item,
Py_SIZE(self), &start, &stop,
&step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return -1;
}
slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
step);
}
else {
PyErr_SetString(PyExc_TypeError,
Expand Down
9 changes: 4 additions & 5 deletions Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,10 +784,10 @@ mmap_subscript(mmap_object *self, PyObject *item)
else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelen;

if (PySlice_GetIndicesEx((PySliceObject *)item, self->size,
&start, &stop, &step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelen = _PySlice_AdjustIndices(self->size, &start, &stop, step);

if (slicelen <= 0)
return PyString_FromStringAndSize("", 0);
Expand Down Expand Up @@ -939,11 +939,10 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelen;

if (PySlice_GetIndicesEx((PySliceObject *)item,
self->size, &start, &stop,
&step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return -1;
}
slicelen = _PySlice_AdjustIndices(self->size, &start, &stop, step);
if (value == NULL) {
PyErr_SetString(PyExc_TypeError,
"mmap object doesn't support slice deletion");
Expand Down
12 changes: 6 additions & 6 deletions Objects/bytearrayobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,11 @@ bytearray_subscript(PyByteArrayObject *self, PyObject *index)
}
else if (PySlice_Check(index)) {
Py_ssize_t start, stop, step, slicelength, cur, i;
if (PySlice_GetIndicesEx((PySliceObject *)index,
PyByteArray_GET_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)index, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(PyByteArray_GET_SIZE(self),
&start, &stop, step);

if (slicelength <= 0)
return PyByteArray_FromStringAndSize("", 0);
Expand Down Expand Up @@ -619,11 +619,11 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
}
}
else if (PySlice_Check(index)) {
if (PySlice_GetIndicesEx((PySliceObject *)index,
PyByteArray_GET_SIZE(self),
&start, &stop, &step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)index, &start, &stop, &step) < 0) {
return -1;
}
slicelen = _PySlice_AdjustIndices(PyByteArray_GET_SIZE(self), &start,
&stop, step);
}
else {
PyErr_SetString(PyExc_TypeError, "bytearray indices must be integer");
Expand Down
10 changes: 6 additions & 4 deletions Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2562,10 +2562,11 @@ list_subscript(PyListObject* self, PyObject* item)
PyObject* it;
PyObject **src, **dest;

if (PySlice_GetIndicesEx((PySliceObject*)item, Py_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
step);

if (slicelength <= 0) {
return PyList_New(0);
Expand Down Expand Up @@ -2611,10 +2612,11 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelength;

if (PySlice_GetIndicesEx((PySliceObject*)item, Py_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return -1;
}
slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
step);

if (step == 1)
return list_ass_slice(self, start, stop, value);
Expand Down
9 changes: 5 additions & 4 deletions Objects/memoryobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,11 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key)
else if (PySlice_Check(key)) {
Py_ssize_t start, stop, step, slicelength;

if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)key, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(get_shape0(view), &start, &stop,
step);

if (step == 1 && view->ndim == 1) {
Py_buffer newview;
Expand Down Expand Up @@ -662,10 +663,10 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value)
else if (PySlice_Check(key)) {
Py_ssize_t stop, step;

if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view),
&start, &stop, &step, &len) < 0) {
if (_PySlice_Unpack((PySliceObject *)key, &start, &stop, &step) < 0) {
return -1;
}
len = _PySlice_AdjustIndices(get_shape0(view), &start, &stop, step);
if (step != 1) {
PyErr_SetNone(PyExc_NotImplementedError);
return -1;
Expand Down
4 changes: 2 additions & 2 deletions Objects/sliceobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,10 @@ slice_indices(PySliceObject* self, PyObject* len)
return NULL;
}

if (PySlice_GetIndicesEx(self, ilen, &start, &stop,
&step, &slicelength) < 0) {
if (_PySlice_Unpack(self, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(ilen, &start, &stop, step);

return Py_BuildValue("(nnn)", start, stop, step);
}
Expand Down
6 changes: 3 additions & 3 deletions Objects/stringobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,11 +1310,11 @@ string_subscript(PyStringObject* self, PyObject* item)
char* result_buf;
PyObject* result;

if (PySlice_GetIndicesEx((PySliceObject*)item,
PyString_GET_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(PyString_GET_SIZE(self), &start,
&stop, step);

if (slicelength <= 0) {
return PyString_FromStringAndSize("", 0);
Expand Down
6 changes: 3 additions & 3 deletions Objects/structseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ structseq_subscript(PyStructSequence *self, PyObject *item)
Py_ssize_t start, stop, step, slicelen, cur, i;
PyObject *result;

if (PySlice_GetIndicesEx((PySliceObject *)item,
VISIBLE_SIZE(self), &start, &stop,
&step, &slicelen) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelen = _PySlice_AdjustIndices(VISIBLE_SIZE(self), &start, &stop,
step);
if (slicelen <= 0)
return PyTuple_New(0);
result = PyTuple_New(slicelen);
Expand Down
6 changes: 3 additions & 3 deletions Objects/tupleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,11 +715,11 @@ tuplesubscript(PyTupleObject* self, PyObject* item)
PyObject* it;
PyObject **src, **dest;

if (PySlice_GetIndicesEx((PySliceObject*)item,
PyTuple_GET_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(PyTuple_GET_SIZE(self), &start,
&stop, step);

if (slicelength <= 0) {
return PyTuple_New(0);
Expand Down
5 changes: 3 additions & 2 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8008,10 +8008,11 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item)
Py_UNICODE* result_buf;
PyObject* result;

if (PySlice_GetIndicesEx((PySliceObject*)item, PyUnicode_GET_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = _PySlice_AdjustIndices(PyUnicode_GET_SIZE(self), &start,
&stop, step);

if (slicelength <= 0) {
return PyUnicode_FromUnicode(NULL, 0);
Expand Down