mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Use strtoul() for oct/hex constants.

Browse source 
Accept * as well as + in varargs arg list.
This commit is contained in:
Guido van Rossum 1992-01-19 16:33:51 +00:00
parent b674c3bba5
commit acbefefe21
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/compile.c
View file

@ -409,6 +409,7 @@ parsenumber(s)
char *s; char *s;
{ {
extern long strtol(); extern long strtol();
extern unsigned long strtoul();
extern double strtod(); extern double strtod();
char *end; char *end;
long x; long x;
@ -419,7 +420,10 @@ parsenumber(s)
extern object *long_scan(); extern object *long_scan();
return long_scan(s, 0); return long_scan(s, 0);
} }
x = strtol(s, &end, 0); if (s[0] == '0')
x = (long) strtoul(s, &end, 0);
else
x = strtol(s, &end, 0);
if (*end == '\0') { if (*end == '\0') {
if (errno != 0) { if (errno != 0) {
err_setstr(OverflowError, err_setstr(OverflowError,
@ -485,7 +489,9 @@ parsestr(s)
case 'n': *p++ = '\n'; break; case 'n': *p++ = '\n'; break;
case 'r': *p++ = '\r'; break; case 'r': *p++ = '\r'; break;
case 'v': *p++ = '\013'; break; /* VT */ case 'v': *p++ = '\013'; break; /* VT */
#if 0
case 'E': *p++ = '\033'; break; /* ESC, not C */ case 'E': *p++ = '\033'; break; /* ESC, not C */
#endif
case 'a': *p++ = '\007'; break; /* BEL, not classic C */ case 'a': *p++ = '\007'; break; /* BEL, not classic C */
case '0': case '1': case '2': case '3': case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7': case '4': case '5': case '6': case '7':
@ -1962,11 +1968,13 @@ com_arglist(c, n)
{ {
int i, nargs, op; int i, nargs, op;
REQ(n, varargslist); REQ(n, varargslist);
/* varargslist: (fpdef ',')* '+' NAME | fpdef (',' fpdef)* [','] */ /* varargslist:
(fpdef ',')* ('+'|'*') NAME | fpdef (',' fpdef)* [','] */
op = UNPACK_ARG; op = UNPACK_ARG;
nargs = (NCH(n) + 1) / 2; nargs = (NCH(n) + 1) / 2;
for (i = 0; i < NCH(n); i += 2) { for (i = 0; i < NCH(n); i += 2) {
if (TYPE(CHILD(n, i)) == PLUS) { int t = TYPE(CHILD(n, i));
if (t == PLUS || t == STAR) {
op = UNPACK_VARARG; op = UNPACK_VARARG;
nargs = i/2; nargs = i/2;
break; break;