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

Get float() to be more portable across platforms. Disable hex strings.

Browse source
This commit is contained in:
Neal Norwitz 2005-12-18 05:03:17 +00:00
parent 87b801cc2d
commit e7214a130b
3 changed files with 33 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Python/pystrtod.c
View file

@ -38,8 +38,7 @@
* Return value: the #gdouble value.
**/
double
PyOS_ascii_strtod(const char *nptr,
char **endptr)
PyOS_ascii_strtod(const char *nptr, char **endptr)
{
char *fail_pos;
double val;
@ -49,7 +48,6 @@ PyOS_ascii_strtod(const char *nptr,
const char *p, *decimal_point_pos;
const char *end = NULL; /* Silence gcc */
/* g_return_val_if_fail (nptr != NULL, 0); */
assert(nptr != NULL);
fail_pos = NULL;
@ -73,64 +71,36 @@ PyOS_ascii_strtod(const char *nptr,
if (*p == '+' || *p == '-')
p++;
if (p[0] == '0' &&
(p[1] == 'x' || p[1] == 'X'))
while (ISDIGIT(*p))
p++;
if (*p == '.')
{
p += 2;
/* HEX - find the (optional) decimal point */
decimal_point_pos = p++;
while (ISXDIGIT(*p))
p++;
if (*p == '.')
{
decimal_point_pos = p++;
while (ISXDIGIT(*p))
p++;
if (*p == 'p' || *p == 'P')
p++;
if (*p == '+' || *p == '-')
p++;
while (ISDIGIT(*p))
p++;
end = p;
}
}
else
{
while (ISDIGIT(*p))
p++;
if (*p == '.')
{
decimal_point_pos = p++;
while (ISDIGIT(*p))
p++;
if (*p == 'e' || *p == 'E')
p++;
if (*p == '+' || *p == '-')
p++;
while (ISDIGIT(*p))
p++;
end = p;
}
if (*p == 'e' || *p == 'E')
p++;
if (*p == '+' || *p == '-')
p++;
while (ISDIGIT(*p))
p++;
end = p;
}
/* For the other cases, we need not convert the decimal point */
/* For the other cases, we need not convert the decimal point */
}
/* Set errno to zero, so that we can distinguish zero results
and underflows */
/* Set errno to zero, so that we can distinguish zero results
and underflows */
errno = 0;
if (decimal_point_pos)
{
char *copy, *c;
/* We need to convert the '.' to the locale specific decimal point */
/* We need to convert the '.' to the locale specific decimal point */
copy = malloc(end - nptr + 1 + decimal_point_len);
c = copy;
@ -155,8 +125,15 @@ PyOS_ascii_strtod(const char *nptr,
free(copy);
}
else
val = strtod(nptr, &fail_pos);
else {
unsigned i = 0;
if (nptr[i] == '-')
i++;
if (nptr[i] == '0' && (nptr[i+1] == 'x' || nptr[i+1] == 'X'))
fail_pos = nptr;
else
val = strtod(nptr, &fail_pos);
}
if (endptr)
*endptr = fail_pos;