mirror of
https://github.com/python/cpython.git
synced 2025-09-16 05:36:29 +00:00
64949cb753
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.
90 lines
2.8 KiB
C
90 lines
2.8 KiB
C
|
|
/* Frame object interface */
|
|
|
|
#ifndef Py_FRAMEOBJECT_H
|
|
#define Py_FRAMEOBJECT_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct {
|
|
int b_type; /* what kind of block this is */
|
|
int b_handler; /* where to jump to find handler */
|
|
int b_level; /* value stack level to pop to */
|
|
} PyTryBlock;
|
|
|
|
typedef struct _frame {
|
|
PyObject_HEAD
|
|
struct _frame *f_back; /* previous frame, or NULL */
|
|
PyCodeObject *f_code; /* code segment */
|
|
PyObject *f_builtins; /* builtin symbol table (PyDictObject) */
|
|
PyObject *f_globals; /* global symbol table (PyDictObject) */
|
|
PyObject *f_locals; /* local symbol table (PyDictObject) */
|
|
PyObject *f_closure; /* environment for free variables */
|
|
PyObject **f_valuestack; /* points after the last local */
|
|
PyObject *f_trace; /* Trace function */
|
|
PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
|
|
PyThreadState *f_tstate;
|
|
int f_lasti; /* Last instruction if called */
|
|
int f_lineno; /* Current line number */
|
|
int f_restricted; /* Flag set if restricted operations
|
|
in this scope */
|
|
int f_iblock; /* index in f_blockstack */
|
|
PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
|
|
int f_nlocals; /* number of locals */
|
|
int f_stacksize; /* size of value stack */
|
|
PyObject *f_localsplus[1]; /* locals+stack, dynamically sized */
|
|
} PyFrameObject;
|
|
|
|
|
|
/* Standard object interface */
|
|
|
|
extern DL_IMPORT(PyTypeObject) PyFrame_Type;
|
|
|
|
#define PyFrame_Check(op) ((op)->ob_type == &PyFrame_Type)
|
|
|
|
DL_IMPORT(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
|
|
PyObject *, PyObject *,
|
|
PyObject *);
|
|
|
|
|
|
/* The rest of the interface is specific for frame objects */
|
|
|
|
/* Tuple access macros */
|
|
|
|
#ifndef Py_DEBUG
|
|
#define GETITEM(v, i) PyTuple_GET_ITEM((PyTupleObject *)(v), (i))
|
|
#define GETITEMNAME(v, i) \
|
|
PyString_AS_STRING((PyStringObject *)GETITEM((v), (i)))
|
|
#else
|
|
#define GETITEM(v, i) PyTuple_GetItem((v), (i))
|
|
#define GETITEMNAME(v, i) PyString_AsString(GETITEM(v, i))
|
|
#endif
|
|
|
|
#define GETUSTRINGVALUE(s) ((unsigned char *)PyString_AS_STRING(s))
|
|
|
|
/* Code access macros */
|
|
|
|
#define Getconst(f, i) (GETITEM((f)->f_code->co_consts, (i)))
|
|
#define Getname(f, i) (GETITEMNAME((f)->f_code->co_names, (i)))
|
|
#define Getnamev(f, i) (GETITEM((f)->f_code->co_names, (i)))
|
|
|
|
|
|
/* Block management functions */
|
|
|
|
DL_IMPORT(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int);
|
|
DL_IMPORT(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *);
|
|
|
|
/* Extend the value stack */
|
|
|
|
DL_IMPORT(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int);
|
|
|
|
/* Conversions between "fast locals" and locals in dictionary */
|
|
|
|
DL_IMPORT(void) PyFrame_LocalsToFast(PyFrameObject *, int);
|
|
DL_IMPORT(void) PyFrame_FastToLocals(PyFrameObject *);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_FRAMEOBJECT_H */
|