diff options
| author | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-03-22 02:32:48 +0000 |
|---|---|---|
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-03-22 02:32:48 +0000 |
| commit | adb12ee4d6908d7871acf6a17efbe8db94a74f9c (patch) | |
| tree | 0b846fdc839cabc4d9941ca7a310b7a04c277575 /Python | |
| parent | 4dfe81db172999a1408f9c55683e0ee161f91f30 (diff) | |
| download | cpython-adb12ee4d6908d7871acf6a17efbe8db94a74f9c.tar.gz | |
If a code object is compiled with nested scopes, define the CO_NESTED flag.
Add PyEval_GetNestedScopes() which returns a non-zero value if the
code for the current interpreter frame has CO_NESTED defined.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 10 | ||||
| -rw-r--r-- | Python/compile.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 156866f0bc..658ccb2a0e 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2667,6 +2667,14 @@ PyEval_GetRestricted(void) } int +PyEval_GetNestedScopes(void) +{ + PyFrameObject *current_frame = PyThreadState_Get()->frame; + return current_frame == NULL ? 0 : + current_frame->f_code->co_flags & CO_NESTED; +} + +int Py_FlushLine(void) { PyObject *f = PySys_GetObject("stdout"); @@ -3448,7 +3456,7 @@ exec_statement(PyFrameObject *f, PyObject *prog, PyObject *globals, else if (PyFile_Check(prog)) { FILE *fp = PyFile_AsFile(prog); char *name = PyString_AsString(PyFile_Name(prog)); - v = PyRun_File(fp, name, Py_file_input, globals, locals); + v = PyRun_File(fp, name, Py_file_input, globals, locals); } else { char *str; diff --git a/Python/compile.c b/Python/compile.c index cd936a3aff..81be103515 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4276,6 +4276,8 @@ 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 (ste->ste_type != TYPE_MODULE) c->c_flags |= CO_NEWLOCALS; if (ste->ste_type == TYPE_FUNCTION) { |