diff options
| author | Georg Brandl <georg@python.org> | 2006-09-24 12:35:36 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-09-24 12:35:36 (GMT) |
| commit | a10d3afed2f27504768dffd3a915a7c876258505 (patch) | |
| tree | 57bb038a659bdde20b75d38ca143476ee95ac59d /Parser | |
| parent | 2c94bf7d410b151d6e7e38275c9dda871a5e8882 (diff) | |
| download | cpython-a10d3afed2f27504768dffd3a915a7c876258505.zip cpython-a10d3afed2f27504768dffd3a915a7c876258505.tar.gz cpython-a10d3afed2f27504768dffd3a915a7c876258505.tar.bz2 | |
Fix a bug in the parser's future statement handling that led to "with"
not being recognized as a keyword after, e.g., this statement:
from __future__ import division, with_statement
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/parser.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Parser/parser.c b/Parser/parser.c index 04d5817..2ce84cd 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -181,7 +181,7 @@ static void future_hack(parser_state *ps) { node *n = ps->p_stack.s_top->s_parent; - node *ch; + node *ch, *cch; int i; /* from __future__ import ..., must have at least 4 children */ @@ -195,15 +195,17 @@ future_hack(parser_state *ps) if (NCH(ch) == 1 && STR(CHILD(ch, 0)) && strcmp(STR(CHILD(ch, 0)), "__future__") != 0) return; - for (i = 3; i < NCH(n); i += 2) { - /* XXX: assume we don't have parentheses in import: - from __future__ import (x, y, z) - */ - ch = CHILD(n, i); - if (NCH(ch) == 1) - ch = CHILD(ch, 0); - if (NCH(ch) >= 1 && TYPE(CHILD(ch, 0)) == NAME && - strcmp(STR(CHILD(ch, 0)), "with_statement") == 0) { + ch = CHILD(n, 3); + /* ch can be a star, a parenthesis or import_as_names */ + if (TYPE(ch) == STAR) + return; + if (TYPE(ch) == LPAR) + ch = CHILD(n, 4); + + for (i = 0; i < NCH(ch); i += 2) { + cch = CHILD(ch, i); + if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME && + strcmp(STR(CHILD(cch, 0)), "with_statement") == 0) { ps->p_flags |= CO_FUTURE_WITH_STATEMENT; break; } |