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

Add text of argument to errors for atoi(), atol(), atof().

Browse source
This commit is contained in:
Guido van Rossum 1996-09-11 23:30:42 +00:00
parent 6beb479b39
commit c35f933c44
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Modules/stropmodule.c
View file

@ -526,6 +526,7 @@ strop_atoi(self, args)
char *s, *end; char *s, *end;
int base = 10; int base = 10;
long x; long x;
char buffer[256]; /* For errors */
if (args != NULL && is_tupleobject(args)) { if (args != NULL && is_tupleobject(args)) {
if (!getargs(args, "(si)", &s, &base)) if (!getargs(args, "(si)", &s, &base))
@ -537,6 +538,8 @@ strop_atoi(self, args)
} }
else if (!getargs(args, "s", &s)) else if (!getargs(args, "s", &s))
return NULL; return NULL;
while (*s && isspace(Py_CHARMASK(*s)))
s++;
if (s[0] == '\0') { if (s[0] == '\0') {
err_setstr(ValueError, "empty string for atoi()"); err_setstr(ValueError, "empty string for atoi()");
return NULL; return NULL;
@ -546,12 +549,16 @@ strop_atoi(self, args)
x = (long) mystrtoul(s, &end, base); x = (long) mystrtoul(s, &end, base);
else else
x = mystrtol(s, &end, base); x = mystrtol(s, &end, base);
while (*end && isspace(Py_CHARMASK(*end)))
end++;
if (*end != '\0') { if (*end != '\0') {
err_setstr(ValueError, "invalid literal for atoi()"); sprintf(buffer, "invalid literal for atoi(): %.200s", s);
err_setstr(ValueError, buffer);
return NULL; return NULL;
} }
else if (errno != 0) { else if (errno != 0) {
err_setstr(OverflowError, "atoi() literal too large"); sprintf(buffer, "atoi() literal too large: %.200s", s);
err_setstr(ValueError, buffer);
return NULL; return NULL;
} }
return newintobject(x); return newintobject(x);
@ -566,6 +573,7 @@ strop_atol(self, args)
char *s, *end; char *s, *end;
int base = 10; int base = 10;
object *x; object *x;
char buffer[256]; /* For errors */
if (args != NULL && is_tupleobject(args)) { if (args != NULL && is_tupleobject(args)) {
if (!getargs(args, "(si)", &s, &base)) if (!getargs(args, "(si)", &s, &base))
@ -577,6 +585,8 @@ strop_atol(self, args)
} }
else if (!getargs(args, "s", &s)) else if (!getargs(args, "s", &s))
return NULL; return NULL;
while (*s && isspace(Py_CHARMASK(*s)))
s++;
if (s[0] == '\0') { if (s[0] == '\0') {
err_setstr(ValueError, "empty string for atol()"); err_setstr(ValueError, "empty string for atol()");
return NULL; return NULL;
@ -586,8 +596,11 @@ strop_atol(self, args)
return NULL; return NULL;
if (base == 0 && (*end == 'l' || *end == 'L')) if (base == 0 && (*end == 'l' || *end == 'L'))
end++; end++;
while (*end && isspace(Py_CHARMASK(*end)))
end++;
if (*end != '\0') { if (*end != '\0') {
err_setstr(ValueError, "invalid literal for atol()"); sprintf(buffer, "invalid literal for atol(): %.200s", s);
err_setstr(ValueError, buffer);
DECREF(x); DECREF(x);
return NULL; return NULL;
} }
@ -603,21 +616,28 @@ strop_atof(self, args)
extern double strtod PROTO((const char *, char **)); extern double strtod PROTO((const char *, char **));
char *s, *end; char *s, *end;
double x; double x;
char buffer[256]; /* For errors */
if (!getargs(args, "s", &s)) if (!getargs(args, "s", &s))
return NULL; return NULL;
while (*s && isspace(Py_CHARMASK(*s)))
s++;
if (s[0] == '\0') { if (s[0] == '\0') {
err_setstr(ValueError, "empty string for atof()"); err_setstr(ValueError, "empty string for atof()");
return NULL; return NULL;
} }
errno = 0; errno = 0;
x = strtod(s, &end); x = strtod(s, &end);
while (*end && isspace(Py_CHARMASK(*end)))
end++;
if (*end != '\0') { if (*end != '\0') {
err_setstr(ValueError, "invalid literal for atof()"); sprintf(buffer, "invalid literal for atof(): %.200s", s);
err_setstr(ValueError, buffer);
return NULL; return NULL;
} }
else if (errno != 0) { else if (errno != 0) {
err_setstr(OverflowError, "atof() literal too large"); sprintf(buffer, "atof() literal too large: %.200s", s);
err_setstr(ValueError, buffer);
return NULL; return NULL;
} }
return newfloatobject(x); return newfloatobject(x);