diff options
| author | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-01-25 17:01:49 (GMT) |
|---|---|---|
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-01-25 17:01:49 (GMT) |
| commit | a6ebc4841db8324d89266436f4b4ac28a1f2141d (patch) | |
| tree | 123f68e94def46310774cef093451a8912cad1ae /Python | |
| parent | 41eb3c7dc5064e8e2c66d3066f6cffb1ae4252b5 (diff) | |
| download | cpython-a6ebc4841db8324d89266436f4b4ac28a1f2141d.zip cpython-a6ebc4841db8324d89266436f4b4ac28a1f2141d.tar.gz cpython-a6ebc4841db8324d89266436f4b4ac28a1f2141d.tar.bz2 | |
Fix bug reported by Ka-Ping Yee: The compiler botched parsing function
parameters that contained both anonymous tuples and *arg or **arg. Ex:
def f(a, (b, c), *d): pass
Fix the symtable_params() to generate names in the right order for
co_varnames slot of code object. Consider *arg and **arg before the
"complex" names introduced by anonymous tuples.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/compile.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/Python/compile.c b/Python/compile.c index 131f97b..7c42479 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4284,7 +4284,7 @@ symtable_default_args(struct symtable *st, node *n) static void symtable_params(struct symtable *st, node *n) { - int i, complex = 0, ext = 0; + int i, complex = -1, ext = 0; node *c = NULL; if (TYPE(n) == parameters) { @@ -4308,17 +4308,9 @@ symtable_params(struct symtable *st, node *n) char nbuf[10]; sprintf(nbuf, ".%d", i); symtable_add_def(st, nbuf, DEF_PARAM); - complex = 1; + complex = i; } } - if (complex) { - int j; - for (j = 0; j < i; j += 2) { - c = CHILD(n, j); - if (TYPE(CHILD(c, 0)) == LPAR) - symtable_params_fplist(st, CHILD(c, 1)); - } - } if (ext) { c = CHILD(n, i); if (TYPE(c) == STAR) { @@ -4327,15 +4319,26 @@ symtable_params(struct symtable *st, node *n) DEF_PARAM | DEF_STAR); i += 2; if (i >= NCH(n)) - return; + c = NULL; + else c = CHILD(n, i); } - if (TYPE(c) == DOUBLESTAR) { + if (c && TYPE(c) == DOUBLESTAR) { i++; symtable_add_def(st, STR(CHILD(n, i)), DEF_PARAM | DEF_DOUBLESTAR); } } + if (complex >= 0) { + int j; + for (j = 0; j <= complex; j++) { + c = CHILD(n, j); + if (TYPE(c) == COMMA) + c = CHILD(n, ++j); + if (TYPE(CHILD(c, 0)) == LPAR) + symtable_params_fplist(st, CHILD(c, 1)); + } + } } static void |