Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-125196: Use PyUnicodeWriter for repr(tuple) (#125242)

This commit is contained in:
Victor Stinner 2024-10-10 12:20:53 +02:00 committed by GitHub
parent 1639d934b9
commit 82dfdc3287
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Objects/tupleobject.c
View File

@ -232,56 +232,54 @@ tuple_repr(PyObject *self)
return res > 0 ? PyUnicode_FromString("(...)") : NULL; return res > 0 ? PyUnicode_FromString("(...)") : NULL;
} }
_PyUnicodeWriter writer; Py_ssize_t prealloc;
_PyUnicodeWriter_Init(&writer);
writer.overallocate = 1;
if (n > 1) { if (n > 1) {
/* "(" + "1" + ", 2" * (len - 1) + ")" */ // "(" + "1" + ", 2" * (len - 1) + ")"
writer.min_length = 1 + 1 + (2 + 1) * (n - 1) + 1; prealloc = 1 + 1 + (2 + 1) * (n - 1) + 1;
} }
else { else {
/* "(1,)" */ // "(1,)"
writer.min_length = 4; prealloc = 4;
}
PyUnicodeWriter *writer = PyUnicodeWriter_Create(prealloc);
if (writer == NULL) {
goto error;
} }
if (_PyUnicodeWriter_WriteChar(&writer, '(') < 0) if (PyUnicodeWriter_WriteChar(writer, '(') < 0) {
goto error; goto error;
}
/* Do repr() on each element. */ /* Do repr() on each element. */
for (Py_ssize_t i = 0; i < n; ++i) { for (Py_ssize_t i = 0; i < n; ++i) {
PyObject *s;
if (i > 0) { if (i > 0) {
if (_PyUnicodeWriter_WriteASCIIString(&writer, ", ", 2) < 0) if (PyUnicodeWriter_WriteChar(writer, ',') < 0) {
goto error; goto error;
} }
if (PyUnicodeWriter_WriteChar(writer, ' ') < 0) {
goto error;
}
}
s = PyObject_Repr(v->ob_item[i]); if (PyUnicodeWriter_WriteRepr(writer, v->ob_item[i]) < 0) {
if (s == NULL)
goto error;
if (_PyUnicodeWriter_WriteStr(&writer, s) < 0) {
Py_DECREF(s);
goto error; goto error;
} }
Py_DECREF(s);
} }
writer.overallocate = 0; if (n == 1) {
if (n > 1) { if (PyUnicodeWriter_WriteChar(writer, ',') < 0) {
if (_PyUnicodeWriter_WriteChar(&writer, ')') < 0)
goto error; goto error;
} }
else { }
if (_PyUnicodeWriter_WriteASCIIString(&writer, ",)", 2) < 0) if (PyUnicodeWriter_WriteChar(writer, ')') < 0) {
goto error; goto error;
} }
Py_ReprLeave((PyObject *)v); Py_ReprLeave((PyObject *)v);
return _PyUnicodeWriter_Finish(&writer); return PyUnicodeWriter_Finish(writer);
error: error:
_PyUnicodeWriter_Dealloc(&writer); PyUnicodeWriter_Discard(writer);
Py_ReprLeave((PyObject *)v); Py_ReprLeave((PyObject *)v);
return NULL; return NULL;
} }