mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-07 01:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Part way to allowing "from __future__ import generators" to communicate

Browse source 
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.
This commit is contained in:
Tim Peters 2001-07-16 02:29:45 +00:00
parent 4dbf87152e
commit 5ba5866281
11 changed files with 77 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/bltinmodule.c
View file

@ -393,6 +393,7 @@ builtin_compile(PyObject *self, PyObject *args)
char *filename;
char *startstr;
int start;
PyCompilerFlags cf;
if (!PyArg_ParseTuple(args, "sss:compile", &str, &filename, &startstr))
return NULL;
@ -407,11 +408,10 @@ builtin_compile(PyObject *self, PyObject *args)
"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 @@ builtin_execfile(PyObject *self, PyObject *args)
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 @@ builtin_execfile(PyObject *self, PyObject *args)
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;