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

Eliminate some locale-dependent calls to isspace and tolower.

This commit is contained in:
Mark Dickinson 2009-05-03 20:59:48 +00:00
parent 85e269b37d
commit 777e4ff503
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/complexobject.c
View File

@ -950,13 +950,13 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
/* position on first nonblank */ /* position on first nonblank */
start = s; start = s;
while (*s && isspace(Py_CHARMASK(*s))) while (Py_ISSPACE(*s))
s++; s++;
if (*s == '(') { if (*s == '(') {
/* Skip over possible bracket from repr(). */ /* Skip over possible bracket from repr(). */
got_bracket = 1; got_bracket = 1;
s++; s++;
while (*s && isspace(Py_CHARMASK(*s))) while (Py_ISSPACE(*s))
s++; s++;
} }
@ -1038,7 +1038,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
} }
/* trailing whitespace and closing bracket */ /* trailing whitespace and closing bracket */
while (*s && isspace(Py_CHARMASK(*s))) while (Py_ISSPACE(*s))
s++; s++;
if (got_bracket) { if (got_bracket) {
/* if there was an opening parenthesis, then the corresponding /* if there was an opening parenthesis, then the corresponding
@ -1046,7 +1046,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
if (*s != ')') if (*s != ')')
goto parse_error; goto parse_error;
s++; s++;
while (*s && isspace(Py_CHARMASK(*s))) while (Py_ISSPACE(*s))
s++; s++;
} }

12
Objects/floatobject.c
View File

@ -214,7 +214,7 @@ PyFloat_FromString(PyObject *v, char **pend)
} }
last = s + len; last = s + len;
while (*s && isspace(Py_CHARMASK(*s))) while (Py_ISSPACE(*s))
s++; s++;
/* We don't care about overflow or underflow. If the platform /* We don't care about overflow or underflow. If the platform
* supports them, infinities and signed zeroes (on underflow) are * supports them, infinities and signed zeroes (on underflow) are
@ -235,7 +235,7 @@ PyFloat_FromString(PyObject *v, char **pend)
} }
/* Since end != s, the platform made *some* kind of sense out /* Since end != s, the platform made *some* kind of sense out
of the input. Trust it. */ of the input. Trust it. */
while (*end && isspace(Py_CHARMASK(*end))) while (Py_ISSPACE(*end))
end++; end++;
if (end != last) { if (end != last) {
if (*end == '\0') if (*end == '\0')
@ -1220,7 +1220,7 @@ float_fromhex(PyObject *cls, PyObject *arg)
********************/ ********************/
/* leading whitespace and optional sign */ /* leading whitespace and optional sign */
while (isspace(*s)) while (Py_ISSPACE(*s))
s++; s++;
if (*s == '-') { if (*s == '-') {
s++; s++;
@ -1244,7 +1244,7 @@ float_fromhex(PyObject *cls, PyObject *arg)
s_store = s; s_store = s;
if (*s == '0') { if (*s == '0') {
s++; s++;
if (tolower(*s) == (int)'x') if (*s == 'x' || *s == 'X')
s++; s++;
else else
s = s_store; s = s_store;
@ -1274,7 +1274,7 @@ float_fromhex(PyObject *cls, PyObject *arg)
goto insane_length_error; goto insane_length_error;
/* [p <exponent>] */ /* [p <exponent>] */
if (tolower(*s) == (int)'p') { if (*s == 'p' || *s == 'P') {
s++; s++;
exp_start = s; exp_start = s;
if (*s == '-' || *s == '+') if (*s == '-' || *s == '+')
@ -1290,7 +1290,7 @@ float_fromhex(PyObject *cls, PyObject *arg)
exp = 0; exp = 0;
/* optional trailing whitespace leading to the end of the string */ /* optional trailing whitespace leading to the end of the string */
while (isspace(*s)) while (Py_ISSPACE(*s))
s++; s++;
if (s != s_end) if (s != s_end)
goto parse_error; goto parse_error;

2
Python/pystrtod.c
View File

@ -718,7 +718,7 @@ _PyOS_double_to_string(char *buf, size_t buf_len, double val,
/* Convert to upper case. */ /* Convert to upper case. */
char *p; char *p;
for (p = buf; *p; p++) for (p = buf; *p; p++)
*p = toupper(*p); *p = Py_TOUPPER(*p);
} }
if (ptype) if (ptype)