diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-07-16 02:29:45 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-07-16 02:29:45 (GMT) |
| commit | 5ba58662817b708a453020f0425fe4747ea6d5cb (patch) | |
| tree | 7d53f1d02fdcc9f6ce4bd1e5130ba1f57269bb3f /Python/compile.c | |
| parent | 4dbf87152eb69e8c8c87d3081630c4bc02d7cace (diff) | |
| download | cpython-5ba58662817b708a453020f0425fe4747ea6d5cb.zip cpython-5ba58662817b708a453020f0425fe4747ea6d5cb.tar.gz cpython-5ba58662817b708a453020f0425fe4747ea6d5cb.tar.bz2 | |
Part way to allowing "from __future__ import generators" to communicate
that info to code dynamically compiled *by* code compiled with generators
enabled. Doesn't yet work because there's still no way to tell the parser
that "yield" is OK (unlike nested_scopes, the parser has its fingers in
this too).
Replaced PyEval_GetNestedScopes by a more-general
PyEval_MergeCompilerFlags. Perhaps I should not have? I doubted it was
*intended* to be part of the public API, so just did.
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Python/compile.c b/Python/compile.c index 92322fc..e950f0f 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3953,10 +3953,15 @@ jcompile(node *n, char *filename, struct compiling *base, return NULL; } if (flags) { - if (flags->cf_nested_scopes) + if (flags->cf_flags & PyCF_NESTED_SCOPES) sc.c_future->ff_nested_scopes = 1; else if (sc.c_future->ff_nested_scopes) - flags->cf_nested_scopes = 1; + flags->cf_flags |= PyCF_NESTED_SCOPES; + + if (flags->cf_flags & PyCF_GENERATORS) + sc.c_future->ff_generators = 1; + else if (sc.c_future->ff_generators) + flags->cf_flags |= PyCF_GENERATORS; } if (symtable_build(&sc, n) < 0) { com_free(&sc); @@ -4426,8 +4431,12 @@ static int symtable_update_flags(struct compiling *c, PySymtableEntryObject *ste, struct symbol_info *si) { - if (c->c_future && c->c_future->ff_nested_scopes) - c->c_flags |= CO_NESTED; + if (c->c_future) { + if (c->c_future->ff_nested_scopes) + c->c_flags |= CO_NESTED; + if (c->c_future->ff_generators) + c->c_flags |= CO_GENERATOR_ALLOWED; + } if (ste->ste_generator) c->c_flags |= CO_GENERATOR; if (ste->ste_type != TYPE_MODULE) |