mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-29 12:54:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Close #16757: Avoid calling the expensive _PyUnicode_FindMaxChar() function

Browse Source 
when possible
This commit is contained in:
Victor Stinner 2013-04-03 02:02:33 +02:00
parent cfc4c13b04
commit eb4b5ac8af
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Objects/unicodeobject.c
View File

@ -13777,7 +13777,7 @@ unicode_format_arg_output(struct unicode_formatter_t *ctx,
Py_ssize_t pindex;
Py_UCS4 signchar;
Py_ssize_t buflen;
Py_UCS4 maxchar, bufmaxchar;
Py_UCS4 maxchar;
Py_ssize_t sublen;
_PyUnicodeWriter *writer = &ctx->writer;
Py_UCS4 fill;
@ -13830,23 +13830,26 @@ unicode_format_arg_output(struct unicode_formatter_t *ctx,
arg->width = len;
/* Prepare the writer */
bufmaxchar = 127;
maxchar = writer->maxchar;
if (!(arg->flags & F_LJUST)) {
if (arg->sign) {
if ((arg->width-1) > len)
bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill);
maxchar = MAX_MAXCHAR(maxchar, fill);
}
else {
if (arg->width > len)
bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill);
maxchar = MAX_MAXCHAR(maxchar, fill);
}
}
maxchar = _PyUnicode_FindMaxChar(str, 0, pindex+len);
bufmaxchar = MAX_MAXCHAR(bufmaxchar, maxchar);
if (PyUnicode_MAX_CHAR_VALUE(str) > maxchar) {
Py_UCS4 strmaxchar = _PyUnicode_FindMaxChar(str, 0, pindex+len);
maxchar = MAX_MAXCHAR(maxchar, strmaxchar);
}
buflen = arg->width;
if (arg->sign && len == arg->width)
buflen++;
if (_PyUnicodeWriter_Prepare(writer, buflen, bufmaxchar) == -1)
if (_PyUnicodeWriter_Prepare(writer, buflen, maxchar) == -1)
return -1;
/* Write the sign if needed */

6
Python/formatter_unicode.c
View File

@ -771,9 +771,13 @@ format_string_internal(PyObject *value, const InternalFormatSpec *format,
calc_padding(len, format->width, format->align, &lpad, &rpad, &total);
maxchar = _PyUnicode_FindMaxChar(value, 0, len);
maxchar = writer->maxchar;
if (lpad != 0 || rpad != 0)
maxchar = Py_MAX(maxchar, format->fill_char);
if (PyUnicode_MAX_CHAR_VALUE(value) > maxchar) {
Py_UCS4 valmaxchar = _PyUnicode_FindMaxChar(value, 0, len);
maxchar = Py_MAX(maxchar, valmaxchar);
}
/* allocate the resulting string */
if (_PyUnicodeWriter_Prepare(writer, total, maxchar) == -1)