1991-02-19 08:39:46 -04:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* Frame object implementation */
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
#include "Python.h"
|
1990-12-20 11:06:42 -04:00
|
|
|
|
|
|
|
#include "compile.h"
|
|
|
|
#include "frameobject.h"
|
|
|
|
#include "opcode.h"
|
|
|
|
#include "structmember.h"
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
#define OFF(x) offsetof(PyFrameObject, x)
|
1990-12-20 11:06:42 -04:00
|
|
|
|
|
|
|
static struct memberlist frame_memberlist[] = {
|
1994-08-30 05:27:36 -03:00
|
|
|
{"f_back", T_OBJECT, OFF(f_back), RO},
|
|
|
|
{"f_code", T_OBJECT, OFF(f_code), RO},
|
1995-01-10 06:39:16 -04:00
|
|
|
{"f_builtins", T_OBJECT, OFF(f_builtins),RO},
|
1994-08-30 05:27:36 -03:00
|
|
|
{"f_globals", T_OBJECT, OFF(f_globals), RO},
|
|
|
|
{"f_locals", T_OBJECT, OFF(f_locals), RO},
|
|
|
|
{"f_lasti", T_INT, OFF(f_lasti), RO},
|
|
|
|
{"f_lineno", T_INT, OFF(f_lineno), RO},
|
1995-01-10 06:39:16 -04:00
|
|
|
{"f_restricted",T_INT, OFF(f_restricted),RO},
|
1994-08-30 05:27:36 -03:00
|
|
|
{"f_trace", T_OBJECT, OFF(f_trace)},
|
1997-05-05 17:56:21 -03:00
|
|
|
{"f_exc_type", T_OBJECT, OFF(f_exc_type)},
|
|
|
|
{"f_exc_value", T_OBJECT, OFF(f_exc_value)},
|
|
|
|
{"f_exc_traceback", T_OBJECT, OFF(f_exc_traceback)},
|
1990-12-20 11:06:42 -04:00
|
|
|
{NULL} /* Sentinel */
|
|
|
|
};
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:40:56 -03:00
|
|
|
frame_getattr(PyFrameObject *f, char *name)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1994-08-30 05:27:36 -03:00
|
|
|
if (strcmp(name, "f_locals") == 0)
|
1997-04-29 11:49:28 -03:00
|
|
|
PyFrame_FastToLocals(f);
|
|
|
|
return PyMember_Get((char *)f, frame_memberlist, name);
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1994-08-30 05:27:36 -03:00
|
|
|
static int
|
2000-07-09 02:40:56 -03:00
|
|
|
frame_setattr(PyFrameObject *f, char *name, PyObject *value)
|
1994-08-30 05:27:36 -03:00
|
|
|
{
|
1997-04-29 11:49:28 -03:00
|
|
|
return PyMember_Set((char *)f, frame_memberlist, name, value);
|
1994-08-30 05:27:36 -03:00
|
|
|
}
|
|
|
|
|
1992-10-18 15:53:57 -03:00
|
|
|
/* Stack frames are allocated and deallocated at a considerable rate.
|
|
|
|
In an attempt to improve the speed of function calls, we maintain a
|
|
|
|
separate free list of stack frames (just like integers are
|
|
|
|
allocated in a special way -- see intobject.c). When a stack frame
|
|
|
|
is on the free list, only the following members have a meaning:
|
|
|
|
ob_type == &Frametype
|
|
|
|
f_back next item on free list, or NULL
|
1997-01-20 00:20:52 -04:00
|
|
|
f_nlocals number of locals
|
|
|
|
f_stacksize size of value stack
|
1992-10-18 15:53:57 -03:00
|
|
|
Note that the value and block stacks are preserved -- this can save
|
|
|
|
another malloc() call or two (and two free() calls as well!).
|
|
|
|
Also note that, unlike for integers, each frame object is a
|
|
|
|
malloc'ed object in its own right -- it is only the actual calls to
|
|
|
|
malloc() that we are trying to save here, not the administration.
|
|
|
|
After all, while a typical program may make millions of calls, a
|
|
|
|
call depth of more than 20 or 30 is probably already exceptional
|
|
|
|
unless the program contains run-away recursion. I hope.
|
|
|
|
*/
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
static PyFrameObject *free_list = NULL;
|
1992-10-18 15:53:57 -03:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
static void
|
2000-07-09 02:40:56 -03:00
|
|
|
frame_dealloc(PyFrameObject *f)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-02-14 12:27:29 -04:00
|
|
|
int i;
|
|
|
|
PyObject **fastlocals;
|
|
|
|
|
2000-03-13 12:01:29 -04:00
|
|
|
Py_TRASHCAN_SAFE_BEGIN(f)
|
1997-02-14 12:27:29 -04:00
|
|
|
/* Kill all local variables */
|
|
|
|
fastlocals = f->f_localsplus;
|
|
|
|
for (i = f->f_nlocals; --i >= 0; ++fastlocals) {
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_XDECREF(*fastlocals);
|
1997-02-14 12:27:29 -04:00
|
|
|
}
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_XDECREF(f->f_back);
|
|
|
|
Py_XDECREF(f->f_code);
|
|
|
|
Py_XDECREF(f->f_builtins);
|
|
|
|
Py_XDECREF(f->f_globals);
|
|
|
|
Py_XDECREF(f->f_locals);
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 16:06:59 -04:00
|
|
|
Py_XDECREF(f->f_closure);
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_XDECREF(f->f_trace);
|
1997-05-05 17:56:21 -03:00
|
|
|
Py_XDECREF(f->f_exc_type);
|
|
|
|
Py_XDECREF(f->f_exc_value);
|
|
|
|
Py_XDECREF(f->f_exc_traceback);
|
1992-10-18 15:53:57 -03:00
|
|
|
f->f_back = free_list;
|
|
|
|
free_list = f;
|
2000-03-13 12:01:29 -04:00
|
|
|
Py_TRASHCAN_SAFE_END(f)
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
PyTypeObject PyFrame_Type = {
|
|
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
1990-12-20 11:06:42 -04:00
|
|
|
0,
|
|
|
|
"frame",
|
1997-04-29 11:49:28 -03:00
|
|
|
sizeof(PyFrameObject),
|
1990-12-20 11:06:42 -04:00
|
|
|
0,
|
1994-08-30 05:27:36 -03:00
|
|
|
(destructor)frame_dealloc, /*tp_dealloc*/
|
1990-12-20 11:06:42 -04:00
|
|
|
0, /*tp_print*/
|
1994-08-30 05:27:36 -03:00
|
|
|
(getattrfunc)frame_getattr, /*tp_getattr*/
|
|
|
|
(setattrfunc)frame_setattr, /*tp_setattr*/
|
1990-12-20 11:06:42 -04:00
|
|
|
0, /*tp_compare*/
|
|
|
|
0, /*tp_repr*/
|
|
|
|
0, /*tp_as_number*/
|
|
|
|
0, /*tp_as_sequence*/
|
|
|
|
0, /*tp_as_mapping*/
|
|
|
|
};
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
PyFrameObject *
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 16:06:59 -04:00
|
|
|
PyFrame_New(PyThreadState *tstate, PyCodeObject *code, PyObject *globals,
|
|
|
|
PyObject *locals, PyObject *closure)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
PyFrameObject *back = tstate->frame;
|
1997-04-29 11:49:28 -03:00
|
|
|
static PyObject *builtin_object;
|
|
|
|
PyFrameObject *f;
|
|
|
|
PyObject *builtins;
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 16:06:59 -04:00
|
|
|
int extras, ncells;
|
1997-01-20 00:20:52 -04:00
|
|
|
|
1995-04-04 08:47:41 -03:00
|
|
|
if (builtin_object == NULL) {
|
1997-01-18 03:58:41 -04:00
|
|
|
builtin_object = PyString_InternFromString("__builtins__");
|
1995-04-04 08:47:41 -03:00
|
|
|
if (builtin_object == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 11:49:28 -03:00
|
|
|
if ((back != NULL && !PyFrame_Check(back)) ||
|
|
|
|
code == NULL || !PyCode_Check(code) ||
|
|
|
|
globals == NULL || !PyDict_Check(globals) ||
|
|
|
|
(locals != NULL && !PyDict_Check(locals))) {
|
|
|
|
PyErr_BadInternalCall();
|
1990-12-20 11:06:42 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1998-09-25 11:11:46 -03:00
|
|
|
extras = code->co_stacksize + code->co_nlocals;
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 16:06:59 -04:00
|
|
|
ncells = PyTuple_GET_SIZE(code->co_cellvars);
|
1998-02-19 16:48:26 -04:00
|
|
|
if (back == NULL || back->f_globals != globals) {
|
|
|
|
builtins = PyDict_GetItem(globals, builtin_object);
|
|
|
|
if (builtins != NULL && PyModule_Check(builtins))
|
|
|
|
builtins = PyModule_GetDict(builtins);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* If we share the globals, we share the builtins.
|
|
|
|
Save a lookup and a call. */
|
|
|
|
builtins = back->f_builtins;
|
|
|
|
}
|
1997-08-04 23:09:46 -03:00
|
|
|
if (builtins != NULL && !PyDict_Check(builtins))
|
|
|
|
builtins = NULL;
|
1992-10-18 15:53:57 -03:00
|
|
|
if (free_list == NULL) {
|
2000-05-03 20:44:39 -03:00
|
|
|
/* PyObject_New is inlined */
|
1997-04-29 11:49:28 -03:00
|
|
|
f = (PyFrameObject *)
|
2000-05-03 20:44:39 -03:00
|
|
|
PyObject_MALLOC(sizeof(PyFrameObject) +
|
|
|
|
extras*sizeof(PyObject *));
|
1995-07-18 11:30:34 -03:00
|
|
|
if (f == NULL)
|
1997-04-29 11:49:28 -03:00
|
|
|
return (PyFrameObject *)PyErr_NoMemory();
|
2000-05-03 20:44:39 -03:00
|
|
|
PyObject_INIT(f, &PyFrame_Type);
|
1992-10-18 15:53:57 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
f = free_list;
|
|
|
|
free_list = free_list->f_back;
|
1997-01-20 00:20:52 -04:00
|
|
|
if (f->f_nlocals + f->f_stacksize < extras) {
|
1997-10-31 16:32:13 -04:00
|
|
|
f = (PyFrameObject *)
|
2000-05-03 20:44:39 -03:00
|
|
|
PyObject_REALLOC(f, sizeof(PyFrameObject) +
|
|
|
|
extras*sizeof(PyObject *));
|
1997-01-20 00:20:52 -04:00
|
|
|
if (f == NULL)
|
1997-04-29 11:49:28 -03:00
|
|
|
return (PyFrameObject *)PyErr_NoMemory();
|
1997-01-20 00:20:52 -04:00
|
|
|
}
|
1997-01-24 00:00:21 -04:00
|
|
|
else
|
|
|
|
extras = f->f_nlocals + f->f_stacksize;
|
2000-05-03 20:44:39 -03:00
|
|
|
PyObject_INIT(f, &PyFrame_Type);
|
1992-10-18 15:53:57 -03:00
|
|
|
}
|
1997-08-04 23:09:46 -03:00
|
|
|
if (builtins == NULL) {
|
1998-02-19 16:48:26 -04:00
|
|
|
/* No builtins! Make up a minimal one. */
|
1997-08-04 23:09:46 -03:00
|
|
|
builtins = PyDict_New();
|
1998-10-19 11:20:20 -03:00
|
|
|
if (builtins == NULL || /* Give them 'None', at least. */
|
|
|
|
PyDict_SetItemString(builtins, "None", Py_None) < 0) {
|
|
|
|
Py_DECREF(f);
|
1998-02-19 16:48:26 -04:00
|
|
|
return NULL;
|
1998-10-19 11:20:20 -03:00
|
|
|
}
|
1997-08-04 23:09:46 -03:00
|
|
|
}
|
|
|
|
else
|
|
|
|
Py_XINCREF(builtins);
|
|
|
|
f->f_builtins = builtins;
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_XINCREF(back);
|
1995-07-18 11:30:34 -03:00
|
|
|
f->f_back = back;
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_INCREF(code);
|
1995-07-18 11:30:34 -03:00
|
|
|
f->f_code = code;
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_INCREF(globals);
|
1995-07-18 11:30:34 -03:00
|
|
|
f->f_globals = globals;
|
1995-07-26 13:14:30 -03:00
|
|
|
if (code->co_flags & CO_NEWLOCALS) {
|
|
|
|
if (code->co_flags & CO_OPTIMIZED)
|
|
|
|
locals = NULL; /* Let fast_2_locals handle it */
|
|
|
|
else {
|
1997-04-29 11:49:28 -03:00
|
|
|
locals = PyDict_New();
|
1995-07-26 13:14:30 -03:00
|
|
|
if (locals == NULL) {
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_DECREF(f);
|
1995-07-26 13:14:30 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1992-10-18 15:53:57 -03:00
|
|
|
}
|
1995-07-18 11:30:34 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (locals == NULL)
|
|
|
|
locals = globals;
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_INCREF(locals);
|
1995-07-18 11:30:34 -03:00
|
|
|
}
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 16:06:59 -04:00
|
|
|
if (closure || ncells) {
|
|
|
|
int i, size;
|
|
|
|
size = ncells;
|
|
|
|
if (closure)
|
|
|
|
size += PyTuple_GET_SIZE(closure);
|
|
|
|
f->f_closure = PyTuple_New(size);
|
|
|
|
for (i = 0; i < ncells; ++i)
|
|
|
|
PyTuple_SET_ITEM(f->f_closure, i, PyCell_New(NULL));
|
|
|
|
for (i = ncells; i < size; ++i) {
|
|
|
|
PyObject *o = PyTuple_GET_ITEM(closure, i - ncells);
|
|
|
|
Py_INCREF(o);
|
|
|
|
PyTuple_SET_ITEM(f->f_closure, i, o);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
f->f_closure = NULL;
|
1995-07-18 11:30:34 -03:00
|
|
|
f->f_locals = locals;
|
1997-01-20 00:20:52 -04:00
|
|
|
f->f_trace = NULL;
|
1997-05-05 17:56:21 -03:00
|
|
|
f->f_exc_type = f->f_exc_value = f->f_exc_traceback = NULL;
|
1997-08-01 23:59:08 -03:00
|
|
|
f->f_tstate = tstate;
|
1997-01-20 00:20:52 -04:00
|
|
|
|
1995-07-18 11:30:34 -03:00
|
|
|
f->f_lasti = 0;
|
1997-01-24 00:00:21 -04:00
|
|
|
f->f_lineno = code->co_firstlineno;
|
1997-08-01 23:59:08 -03:00
|
|
|
f->f_restricted = (builtins != tstate->interp->builtins);
|
1997-01-20 00:20:52 -04:00
|
|
|
f->f_iblock = 0;
|
|
|
|
f->f_nlocals = code->co_nlocals;
|
1997-01-24 00:00:21 -04:00
|
|
|
f->f_stacksize = extras - code->co_nlocals;
|
1990-12-20 11:06:42 -04:00
|
|
|
|
1997-01-20 00:20:52 -04:00
|
|
|
while (--extras >= 0)
|
|
|
|
f->f_localsplus[extras] = NULL;
|
|
|
|
|
|
|
|
f->f_valuestack = f->f_localsplus + f->f_nlocals;
|
|
|
|
|
|
|
|
return f;
|
1992-10-18 15:53:57 -03:00
|
|
|
}
|
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* Block management */
|
|
|
|
|
|
|
|
void
|
2000-07-09 02:40:56 -03:00
|
|
|
PyFrame_BlockSetup(PyFrameObject *f, int type, int handler, int level)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-04-29 11:49:28 -03:00
|
|
|
PyTryBlock *b;
|
1997-01-20 00:20:52 -04:00
|
|
|
if (f->f_iblock >= CO_MAXBLOCKS)
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_FatalError("XXX block stack overflow");
|
1990-12-20 11:06:42 -04:00
|
|
|
b = &f->f_blockstack[f->f_iblock++];
|
|
|
|
b->b_type = type;
|
|
|
|
b->b_level = level;
|
|
|
|
b->b_handler = handler;
|
|
|
|
}
|
|
|
|
|
1997-04-29 11:49:28 -03:00
|
|
|
PyTryBlock *
|
2000-07-09 02:40:56 -03:00
|
|
|
PyFrame_BlockPop(PyFrameObject *f)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-04-29 11:49:28 -03:00
|
|
|
PyTryBlock *b;
|
1995-01-02 15:07:15 -04:00
|
|
|
if (f->f_iblock <= 0)
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_FatalError("XXX block stack underflow");
|
1990-12-20 11:06:42 -04:00
|
|
|
b = &f->f_blockstack[--f->f_iblock];
|
|
|
|
return b;
|
|
|
|
}
|
1994-08-30 05:27:36 -03:00
|
|
|
|
|
|
|
/* Convert between "fast" version of locals and dictionary version */
|
|
|
|
|
|
|
|
void
|
2000-07-09 02:40:56 -03:00
|
|
|
PyFrame_FastToLocals(PyFrameObject *f)
|
1994-08-30 05:27:36 -03:00
|
|
|
{
|
1997-01-20 00:20:52 -04:00
|
|
|
/* Merge fast locals into f->f_locals */
|
1997-04-29 11:49:28 -03:00
|
|
|
PyObject *locals, *map;
|
|
|
|
PyObject **fast;
|
|
|
|
PyObject *error_type, *error_value, *error_traceback;
|
1994-08-30 05:27:36 -03:00
|
|
|
int j;
|
|
|
|
if (f == NULL)
|
|
|
|
return;
|
1995-07-18 11:30:34 -03:00
|
|
|
locals = f->f_locals;
|
|
|
|
if (locals == NULL) {
|
1997-04-29 11:49:28 -03:00
|
|
|
locals = f->f_locals = PyDict_New();
|
1995-07-18 11:30:34 -03:00
|
|
|
if (locals == NULL) {
|
1997-04-29 11:49:28 -03:00
|
|
|
PyErr_Clear(); /* Can't report it :-( */
|
1995-07-18 11:30:34 -03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
1997-01-20 00:20:52 -04:00
|
|
|
if (f->f_nlocals == 0)
|
1995-07-26 13:14:30 -03:00
|
|
|
return;
|
|
|
|
map = f->f_code->co_varnames;
|
1997-04-29 11:49:28 -03:00
|
|
|
if (!PyDict_Check(locals) || !PyTuple_Check(map))
|
1994-08-30 05:27:36 -03:00
|
|
|
return;
|
1997-04-29 11:49:28 -03:00
|
|
|
PyErr_Fetch(&error_type, &error_value, &error_traceback);
|
1997-01-20 00:20:52 -04:00
|
|
|
fast = f->f_localsplus;
|
1997-04-29 11:49:28 -03:00
|
|
|
j = PyTuple_Size(map);
|
1997-01-20 00:20:52 -04:00
|
|
|
if (j > f->f_nlocals)
|
|
|
|
j = f->f_nlocals;
|
|
|
|
for (; --j >= 0; ) {
|
1997-04-29 11:49:28 -03:00
|
|
|
PyObject *key = PyTuple_GetItem(map, j);
|
|
|
|
PyObject *value = fast[j];
|
1994-08-30 05:27:36 -03:00
|
|
|
if (value == NULL) {
|
1997-04-29 11:49:28 -03:00
|
|
|
PyErr_Clear();
|
|
|
|
if (PyDict_DelItem(locals, key) != 0)
|
|
|
|
PyErr_Clear();
|
1994-08-30 05:27:36 -03:00
|
|
|
}
|
|
|
|
else {
|
1997-04-29 11:49:28 -03:00
|
|
|
if (PyDict_SetItem(locals, key, value) != 0)
|
|
|
|
PyErr_Clear();
|
1994-08-30 05:27:36 -03:00
|
|
|
}
|
|
|
|
}
|
1997-04-29 11:49:28 -03:00
|
|
|
PyErr_Restore(error_type, error_value, error_traceback);
|
1994-08-30 05:27:36 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-07-09 02:40:56 -03:00
|
|
|
PyFrame_LocalsToFast(PyFrameObject *f, int clear)
|
1994-08-30 05:27:36 -03:00
|
|
|
{
|
1997-01-20 00:20:52 -04:00
|
|
|
/* Merge f->f_locals into fast locals */
|
1997-04-29 11:49:28 -03:00
|
|
|
PyObject *locals, *map;
|
|
|
|
PyObject **fast;
|
|
|
|
PyObject *error_type, *error_value, *error_traceback;
|
1994-08-30 05:27:36 -03:00
|
|
|
int j;
|
|
|
|
if (f == NULL)
|
|
|
|
return;
|
|
|
|
locals = f->f_locals;
|
1995-07-18 11:30:34 -03:00
|
|
|
map = f->f_code->co_varnames;
|
1997-01-20 00:29:16 -04:00
|
|
|
if (locals == NULL || f->f_code->co_nlocals == 0)
|
1994-08-30 05:27:36 -03:00
|
|
|
return;
|
1997-04-29 11:49:28 -03:00
|
|
|
if (!PyDict_Check(locals) || !PyTuple_Check(map))
|
1994-08-30 05:27:36 -03:00
|
|
|
return;
|
1997-04-29 11:49:28 -03:00
|
|
|
PyErr_Fetch(&error_type, &error_value, &error_traceback);
|
1997-01-20 00:20:52 -04:00
|
|
|
fast = f->f_localsplus;
|
1997-04-29 11:49:28 -03:00
|
|
|
j = PyTuple_Size(map);
|
1997-01-20 00:20:52 -04:00
|
|
|
if (j > f->f_nlocals)
|
|
|
|
j = f->f_nlocals;
|
|
|
|
for (; --j >= 0; ) {
|
1997-04-29 11:49:28 -03:00
|
|
|
PyObject *key = PyTuple_GetItem(map, j);
|
|
|
|
PyObject *value = PyDict_GetItem(locals, key);
|
1998-05-13 22:49:48 -03:00
|
|
|
Py_XINCREF(value);
|
1997-01-20 00:20:52 -04:00
|
|
|
if (value != NULL || clear) {
|
1997-04-29 11:49:28 -03:00
|
|
|
Py_XDECREF(fast[j]);
|
1997-01-20 00:20:52 -04:00
|
|
|
fast[j] = value;
|
|
|
|
}
|
1994-08-30 05:27:36 -03:00
|
|
|
}
|
1997-04-29 11:49:28 -03:00
|
|
|
PyErr_Restore(error_type, error_value, error_traceback);
|
1994-08-30 05:27:36 -03:00
|
|
|
}
|
1997-08-04 23:09:46 -03:00
|
|
|
|
|
|
|
/* Clear out the free list */
|
|
|
|
|
|
|
|
void
|
2000-07-09 02:40:56 -03:00
|
|
|
PyFrame_Fini(void)
|
1997-08-04 23:09:46 -03:00
|
|
|
{
|
|
|
|
while (free_list != NULL) {
|
|
|
|
PyFrameObject *f = free_list;
|
|
|
|
free_list = free_list->f_back;
|
2000-05-03 20:44:39 -03:00
|
|
|
PyObject_DEL(f);
|
1997-08-04 23:09:46 -03:00
|
|
|
}
|
|
|
|
}
|