Mercurial > cpython-lru_cache-weakref
diff Objects/stringobject.c @ 38291:ad1e2438cfaa legacy-trunk
needforspeed: speed up upper and lower for 8-bit string objects.
(the unicode versions of these are still 2x faster on windows,
though...)
based on work by Andrew Dalke, with tweaks by yours truly.
| author | Fredrik Lundh <fredrik@pythonware.com> |
|---|---|
| date | Thu, 25 May 2006 15:22:03 +0000 |
| parents | 7e16fcce34a1 |
| children | e15b14c7fa14 |
line wrap: on
line diff
--- a/Objects/stringobject.c Thu May 25 12:27:59 2006 +0000 +++ b/Objects/stringobject.c Thu May 25 15:22:03 2006 +0000 @@ -2036,26 +2036,25 @@ static PyObject * string_lower(PyStringObject *self) { - char *s = PyString_AS_STRING(self), *s_new; + char *s; Py_ssize_t i, n = PyString_GET_SIZE(self); PyObject *newobj; - newobj = PyString_FromStringAndSize(NULL, n); - if (newobj == NULL) + newobj = PyString_FromStringAndSize(PyString_AS_STRING(self), n); + if (!newobj) return NULL; - s_new = PyString_AsString(newobj); + + s = PyString_AS_STRING(newobj); + for (i = 0; i < n; i++) { - int c = Py_CHARMASK(*s++); - if (isupper(c)) { - *s_new = tolower(c); - } else - *s_new = c; - s_new++; + char c = Py_CHARMASK(s[i]); + if (isupper(c)) + s[i] = _tolower(c); } + return newobj; } - PyDoc_STRVAR(upper__doc__, "S.upper() -> string\n\ \n\ @@ -2064,26 +2063,25 @@ static PyObject * string_upper(PyStringObject *self) { - char *s = PyString_AS_STRING(self), *s_new; + char *s; Py_ssize_t i, n = PyString_GET_SIZE(self); PyObject *newobj; - newobj = PyString_FromStringAndSize(NULL, n); - if (newobj == NULL) + newobj = PyString_FromStringAndSize(PyString_AS_STRING(self), n); + if (!newobj) return NULL; - s_new = PyString_AsString(newobj); + + s = PyString_AS_STRING(newobj); + for (i = 0; i < n; i++) { - int c = Py_CHARMASK(*s++); - if (islower(c)) { - *s_new = toupper(c); - } else - *s_new = c; - s_new++; + char c = Py_CHARMASK(s[i]); + if (islower(c)) + s[i] = _toupper(c); } + return newobj; } - PyDoc_STRVAR(title__doc__, "S.title() -> string\n\ \n\