diff options
| author | Eric Smith <eric@trueblade.com> | 2008-03-18 23:45:49 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2008-03-18 23:45:49 (GMT) |
| commit | 7c47894a2aaa8dbc5397a256b16cd7deddef1d7e (patch) | |
| tree | 8a04cef2a98907c1f20cde46f0efec77a5730a65 /Parser/parser.c | |
| parent | 6c0ff8aacd5b493892878e138b97af66e4bfaf37 (diff) | |
| download | cpython-7c47894a2aaa8dbc5397a256b16cd7deddef1d7e.zip cpython-7c47894a2aaa8dbc5397a256b16cd7deddef1d7e.tar.gz cpython-7c47894a2aaa8dbc5397a256b16cd7deddef1d7e.tar.bz2 | |
Backport of the print function, using a __future__ import.
This work is substantially Anthony Baxter's, from issue
1633807. I just freshened it, made a few minor tweaks,
and added the test cases. I also created issue 2412,
which is to check for 2to3's behavior with the print
function. I also added myself to ACKS.
Diffstat (limited to 'Parser/parser.c')
| -rw-r--r-- | Parser/parser.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Parser/parser.c b/Parser/parser.c index 2ce84cd..61da37d 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -149,12 +149,10 @@ classify(parser_state *ps, int type, char *str) strcmp(l->lb_str, s) != 0) continue; #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD - if (!(ps->p_flags & CO_FUTURE_WITH_STATEMENT)) { - if (s[0] == 'w' && strcmp(s, "with") == 0) - break; /* not a keyword yet */ - else if (s[0] == 'a' && strcmp(s, "as") == 0) - break; /* not a keyword yet */ - } + if (ps->p_flags & CO_FUTURE_PRINT_FUNCTION && + s[0] == 'p' && strcmp(s, "print") == 0) { + break; /* no longer a keyword */ + } #endif D(printf("It's a keyword\n")); return n - i; @@ -208,6 +206,10 @@ future_hack(parser_state *ps) strcmp(STR(CHILD(cch, 0)), "with_statement") == 0) { ps->p_flags |= CO_FUTURE_WITH_STATEMENT; break; + } else if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME && + strcmp(STR(CHILD(cch, 0)), "print_function") == 0) { + ps->p_flags |= CO_FUTURE_PRINT_FUNCTION; + break; } } } |