diff options
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/parser.c | 22 | ||||
| -rw-r--r-- | Parser/parsetok.c | 6 | ||||
| -rw-r--r-- | Parser/tokenizer.c | 2 |
3 files changed, 16 insertions, 14 deletions
diff --git a/Parser/parser.c b/Parser/parser.c index 45302ed..134e14c 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -183,7 +183,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 */ @@ -197,15 +197,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; } diff --git a/Parser/parsetok.c b/Parser/parsetok.c index 01a3051..71bed29 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -82,9 +82,6 @@ PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start, return parsetok(tok, g, start, err_ret, flags); } -/* Parse input coming from the given tokenizer structure. - Return error code. */ - #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD static char with_msg[] = "%s:%d: Warning: 'with' will become a reserved keyword in Python 2.6\n"; @@ -101,6 +98,9 @@ warn(const char *msg, const char *filename, int lineno) } #endif +/* Parse input coming from the given tokenizer structure. + Return error code. */ + static node * parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, int flags) diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 2a73106..947ad9c 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -896,7 +896,7 @@ tok_nextc(register struct tok_state *tok) tok->cur = tok->buf + cur; tok->line_start = tok->cur; /* replace "\r\n" with "\n" */ - /* For Mac leave the \r, giving syntax error */ + /* For Mac leave the \r, giving a syntax error */ pt = tok->inp - 2; if (pt >= tok->buf && *pt == '\r') { *pt++ = '\n'; |