mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 14:42:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Optimize repr(str): use _PyUnicode_FastCopyCharacters() when no character is escaped

Browse source
This commit is contained in:
Victor Stinner 2013-04-14 18:45:39 +02:00
parent af03757d20
commit 55c08781e8
1 changed files with 83 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/unicodeobject.c
View file

@ -11968,7 +11968,7 @@ unicode_repr(PyObject *unicode)
Py_ssize_t isize; Py_ssize_t isize;
Py_ssize_t osize, squote, dquote, i, o; Py_ssize_t osize, squote, dquote, i, o;
Py_UCS4 max, quote; Py_UCS4 max, quote;
int ikind, okind; int ikind, okind, unchanged;
void *idata, *odata; void *idata, *odata;
if (PyUnicode_READY(unicode) == -1) if (PyUnicode_READY(unicode) == -1)
@ -11979,7 +11979,7 @@ unicode_repr(PyObject *unicode)
/* Compute length of output, quote characters, and /* Compute length of output, quote characters, and
maximum character */ maximum character */
osize = 2; /* quotes */ osize = 0;
max = 127; max = 127;
squote = dquote = 0; squote = dquote = 0;
ikind = PyUnicode_KIND(unicode); ikind = PyUnicode_KIND(unicode);
@ -12010,7 +12010,9 @@ unicode_repr(PyObject *unicode)
} }
quote = '\''; quote = '\'';
unchanged = (osize == isize);
if (squote) { if (squote) {
unchanged = 0;
if (dquote) if (dquote)
/* Both squote and dquote present. Use squote, /* Both squote and dquote present. Use squote,
and escape them */ and escape them */
@ -12018,6 +12020,7 @@ unicode_repr(PyObject *unicode)
else else
quote = '"'; quote = '"';
} }
osize += 2; /* quotes */
repr = PyUnicode_New(osize, max); repr = PyUnicode_New(osize, max);
if (repr == NULL) if (repr == NULL)
@ -12027,7 +12030,12 @@ unicode_repr(PyObject *unicode)
PyUnicode_WRITE(okind, odata, 0, quote); PyUnicode_WRITE(okind, odata, 0, quote);
PyUnicode_WRITE(okind, odata, osize-1, quote); PyUnicode_WRITE(okind, odata, osize-1, quote);
if (unchanged) {
_PyUnicode_FastCopyCharacters(repr, 1,
unicode, 0,
isize);
}
else {
for (i = 0, o = 1; i < isize; i++) { for (i = 0, o = 1; i < isize; i++) {
Py_UCS4 ch = PyUnicode_READ(ikind, idata, i); Py_UCS4 ch = PyUnicode_READ(ikind, idata, i);
@ -12105,6 +12113,7 @@ unicode_repr(PyObject *unicode)
} }
} }
} }
}
/* Closing quote already added at the beginning */ /* Closing quote already added at the beginning */
assert(_PyUnicode_CheckConsistency(repr, 1)); assert(_PyUnicode_CheckConsistency(repr, 1));
return repr; return repr;