mirror of
https://github.com/python/cpython.git
synced 2025-11-01 18:51:43 +00:00
Merge back to main trunk
This commit is contained in:
parent
013142a95f
commit
1d5735e846
37 changed files with 681 additions and 831 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
|
@ -304,10 +304,8 @@ r_object(p)
|
|||
|
||||
case TYPE_FLOAT:
|
||||
{
|
||||
extern double strtod PROTO((const char *, char **));
|
||||
extern double atof PROTO((const char *));
|
||||
char buf[256];
|
||||
double res;
|
||||
char *end;
|
||||
n = r_byte(p);
|
||||
if (r_string(buf, (int)n, p) != n) {
|
||||
err_setstr(EOFError,
|
||||
|
|
@ -315,18 +313,7 @@ r_object(p)
|
|||
return NULL;
|
||||
}
|
||||
buf[n] = '\0';
|
||||
errno = 0;
|
||||
res = strtod(buf, &end);
|
||||
if (*end != '\0') {
|
||||
err_setstr(ValueError, "bad float syntax");
|
||||
return NULL;
|
||||
}
|
||||
if (errno != 0) {
|
||||
err_setstr(ValueError,
|
||||
"float constant too large");
|
||||
return NULL;
|
||||
}
|
||||
return newfloatobject(res);
|
||||
return newfloatobject(atof(buf));
|
||||
}
|
||||
|
||||
case TYPE_STRING:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue