Mercurial > cpython-lru_cache-weakref
diff Python/compile.c @ 18611:fdb36a0c7e6e legacy-trunk
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.
| author | Tim Peters <tim.peters@gmail.com> |
|---|---|
| date | Mon, 16 Jul 2001 02:29:45 +0000 |
| parents | 41243cb4ea05 |
| children | 4030c9019067 |
line wrap: on
line diff
--- a/Python/compile.c Mon Jul 16 02:17:14 2001 +0000 +++ b/Python/compile.c Mon Jul 16 02:29:45 2001 +0000 @@ -3953,10 +3953,15 @@ 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 @@ 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)