summaryrefslogtreecommitdiffstats
path: root/Parser/parsetok.c
diff options
context:
space:
mode:
authorNeil Schemenauer <nascheme@enme.ucalgary.ca>2002-03-22 23:53:36 (GMT)
committerNeil Schemenauer <nascheme@enme.ucalgary.ca>2002-03-22 23:53:36 (GMT)
commitc24ea08644279224a7a8be419648261f9566c9b3 (patch)
treece7be60ecb2edfe2e8dbac4c231ef881130b3071 /Parser/parsetok.c
parent12a6d942d8138b4dd1a32d4d9a40ca312708aeee (diff)
downloadcpython-c24ea08644279224a7a8be419648261f9566c9b3.zip
cpython-c24ea08644279224a7a8be419648261f9566c9b3.tar.gz
cpython-c24ea08644279224a7a8be419648261f9566c9b3.tar.bz2
Disable the parser hacks that enabled the "yield" keyword using a future
statement.
Diffstat (limited to 'Parser/parsetok.c')
-rw-r--r--Parser/parsetok.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Parser/parsetok.c b/Parser/parsetok.c
index ed4fe7b..472b0f5 100644
--- a/Parser/parsetok.c
+++ b/Parser/parsetok.c
@@ -83,8 +83,10 @@ PyParser_ParseFileFlags(FILE *fp, char *filename, grammar *g, int start,
/* Parse input coming from the given tokenizer structure.
Return error code. */
+#if 0 /* future keyword */
static char yield_msg[] =
"%s:%d: Warning: 'yield' will become a reserved keyword in the future\n";
+#endif
static node *
parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
@@ -99,8 +101,10 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
err_ret->error = E_NOMEM;
return NULL;
}
+#if 0 /* future keyword */
if (flags & PyPARSE_YIELD_IS_KEYWORD)
ps->p_generators = 1;
+#endif
for (;;) {
char *a, *b;
@@ -130,6 +134,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
strncpy(str, a, len);
str[len] = '\0';
+#if 0 /* future keyword */
/* Warn about yield as NAME */
if (type == NAME && !ps->p_generators &&
len == 5 && str[0] == 'y' && strcmp(str, "yield") == 0)
@@ -137,6 +142,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
err_ret->filename==NULL ?
"<string>" : err_ret->filename,
tok->lineno);
+#endif
if ((err_ret->error =
PyParser_AddToken(ps, (int)type, str, tok->lineno,