Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.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 | 9653272f036f |
| children | 03305602ba9b |
line wrap: on
line diff
--- a/Python/bltinmodule.c Mon Jul 16 02:17:14 2001 +0000 +++ b/Python/bltinmodule.c Mon Jul 16 02:29:45 2001 +0000 @@ -393,6 +393,7 @@ char *filename; char *startstr; int start; + PyCompilerFlags cf; if (!PyArg_ParseTuple(args, "sss:compile", &str, &filename, &startstr)) return NULL; @@ -407,11 +408,10 @@ "compile() arg 3 must be 'exec' or 'eval' or 'single'"); return NULL; } - if (PyEval_GetNestedScopes()) { - PyCompilerFlags cf; - cf.cf_nested_scopes = 1; + cf.cf_flags = 0; + if (PyEval_MergeCompilerFlags(&cf)) return Py_CompileStringFlags(str, filename, start, &cf); - } else + else return Py_CompileString(str, filename, start); } @@ -822,6 +822,7 @@ PyObject *globals = Py_None, *locals = Py_None; PyObject *res; FILE* fp; + PyCompilerFlags cf; if (!PyArg_ParseTuple(args, "s|O!O!:execfile", &filename, @@ -847,12 +848,11 @@ PyErr_SetFromErrno(PyExc_IOError); return NULL; } - if (PyEval_GetNestedScopes()) { - PyCompilerFlags cf; - cf.cf_nested_scopes = 1; + cf.cf_flags = 0; + if (PyEval_MergeCompilerFlags(&cf)) res = PyRun_FileExFlags(fp, filename, Py_file_input, globals, locals, 1, &cf); - } else + else res = PyRun_FileEx(fp, filename, Py_file_input, globals, locals, 1); return res;