mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-91266: refactor bytearray strip methods (GH-32096)

Browse source
This commit is contained in:
Pieter Eendebak 2022-04-14 04:20:38 +02:00 • committed by GitHub
parent 325d6f5035
commit 355cbaadbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2022-04-13-07-14-30.gh-issue-91266.6Vkzzt.rst Normal file
View file

@ -0,0 +1 @@
Refactor the ``bytearray`` strip methods ``strip``, ``lstrip`` and ``rstrip`` to use a common implementation.

123
Objects/bytearrayobject.c
View file

@ -1845,26 +1845,46 @@ bytearray_remove_impl(PyByteArrayObject *self, int value)
Py_RETURN_NONE; Py_RETURN_NONE;
} }
/* XXX These two helpers could be optimized if argsize == 1 */ #define LEFTSTRIP 0
#define RIGHTSTRIP 1
#define BOTHSTRIP 2
static Py_ssize_t static PyObject*
lstrip_helper(const char *myptr, Py_ssize_t mysize, bytearray_strip_impl_helper(PyByteArrayObject* self, PyObject* bytes, int striptype)
const void *argptr, Py_ssize_t argsize)
{ {
Py_ssize_t i = 0; Py_ssize_t mysize, byteslen;
while (i < mysize && memchr(argptr, (unsigned char) myptr[i], argsize)) const char* myptr;
i++; const char* bytesptr;
return i; Py_buffer vbytes;
if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
} }
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char*)vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
static Py_ssize_t Py_ssize_t left = 0;
rstrip_helper(const char *myptr, Py_ssize_t mysize, if (striptype != RIGHTSTRIP) {
const void *argptr, Py_ssize_t argsize) while (left < mysize && memchr(bytesptr, (unsigned char)myptr[left], byteslen))
{ left++;
Py_ssize_t i = mysize - 1; }
while (i >= 0 && memchr(argptr, (unsigned char) myptr[i], argsize)) Py_ssize_t right = mysize;
i--; if (striptype != LEFTSTRIP) {
return i + 1; do {
right--;
} while (right >= left && memchr(bytesptr, (unsigned char)myptr[right], byteslen));
right++;
}
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr + left, right - left);
} }
/*[clinic input] /*[clinic input]
@ -1882,31 +1902,7 @@ static PyObject *
bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes) bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes)
/*[clinic end generated code: output=760412661a34ad5a input=ef7bb59b09c21d62]*/ /*[clinic end generated code: output=760412661a34ad5a input=ef7bb59b09c21d62]*/
{ {
Py_ssize_t left, right, mysize, byteslen; return bytearray_strip_impl_helper(self, bytes, BOTHSTRIP);
char *myptr;
const char *bytesptr;
Py_buffer vbytes;
if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
}
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char *) vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
left = lstrip_helper(myptr, mysize, bytesptr, byteslen);
if (left == mysize)
right = left;
else
right = rstrip_helper(myptr, mysize, bytesptr, byteslen);
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr + left, right - left);
} }
/*[clinic input] /*[clinic input]
@ -1924,28 +1920,7 @@ static PyObject *
bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes) bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes)
/*[clinic end generated code: output=d005c9d0ab909e66 input=80843f975dd7c480]*/ /*[clinic end generated code: output=d005c9d0ab909e66 input=80843f975dd7c480]*/
{ {
Py_ssize_t left, right, mysize, byteslen; return bytearray_strip_impl_helper(self, bytes, LEFTSTRIP);
char *myptr;
const char *bytesptr;
Py_buffer vbytes;
if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
}
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char *) vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
left = lstrip_helper(myptr, mysize, bytesptr, byteslen);
right = mysize;
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr + left, right - left);
} }
/*[clinic input] /*[clinic input]
@ -1963,27 +1938,7 @@ static PyObject *
bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes) bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes)
/*[clinic end generated code: output=030e2fbd2f7276bd input=e728b994954cfd91]*/ /*[clinic end generated code: output=030e2fbd2f7276bd input=e728b994954cfd91]*/
{ {
Py_ssize_t right, mysize, byteslen; return bytearray_strip_impl_helper(self, bytes, RIGHTSTRIP);
char *myptr;
const char *bytesptr;
Py_buffer vbytes;
if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
}
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char *) vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
right = rstrip_helper(myptr, mysize, bytesptr, byteslen);
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr, right);
} }
/*[clinic input] /*[clinic input]