mirror of
https://github.com/python/cpython.git
synced 2024-11-28 16:45:42 +01: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.
60 lines
2.0 KiB
C
60 lines
2.0 KiB
C
|
|
/* Definitions for bytecode */
|
|
|
|
#ifndef Py_COMPILE_H
|
|
#define Py_COMPILE_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Bytecode object */
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
int co_argcount; /* #arguments, except *args */
|
|
int co_nlocals; /* #local variables */
|
|
int co_stacksize; /* #entries needed for evaluation stack */
|
|
int co_flags; /* CO_..., see below */
|
|
PyObject *co_code; /* instruction opcodes */
|
|
PyObject *co_consts; /* list (constants used) */
|
|
PyObject *co_names; /* list of strings (names used) */
|
|
PyObject *co_varnames; /* tuple of strings (local variable names) */
|
|
PyObject *co_freevars; /* tuple of strings (free variable names) */
|
|
PyObject *co_cellvars; /* tuple of strings (cell variable names) */
|
|
/* The rest doesn't count for hash/cmp */
|
|
PyObject *co_filename; /* string (where it was loaded from) */
|
|
PyObject *co_name; /* string (name, for reference) */
|
|
int co_firstlineno; /* first source line number */
|
|
PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) */
|
|
} PyCodeObject;
|
|
|
|
/* Masks for co_flags above */
|
|
#define CO_OPTIMIZED 0x0001
|
|
#define CO_NEWLOCALS 0x0002
|
|
#define CO_VARARGS 0x0004
|
|
#define CO_VARKEYWORDS 0x0008
|
|
|
|
extern DL_IMPORT(PyTypeObject) PyCode_Type;
|
|
|
|
#define PyCode_Check(op) ((op)->ob_type == &PyCode_Type)
|
|
|
|
#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
|
|
|
|
/* Public interface */
|
|
struct _node; /* Declare the existence of this type */
|
|
DL_IMPORT(PyCodeObject *) PyNode_Compile(struct _node *, char *);
|
|
DL_IMPORT(PyCodeObject *) PyCode_New(
|
|
int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
|
|
PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *);
|
|
/* same as struct above */
|
|
DL_IMPORT(int) PyCode_Addr2Line(PyCodeObject *, int);
|
|
|
|
/* for internal use only */
|
|
#define _PyCode_GETCODEPTR(co, pp) \
|
|
((*(co)->co_code->ob_type->tp_as_buffer->bf_getreadbuffer) \
|
|
((co)->co_code, 0, (void **)(pp)))
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_COMPILE_H */
|