mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

instead of hacking __locals__ in during bytecode generation, put it in the symtable

Browse source
This commit is contained in:
Benjamin Peterson 2009-03-03 00:54:05 +00:00
parent 231b7f1cd6
commit dcaf329e40
2 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/compile.c
View file

@ -1524,23 +1524,14 @@ compiler_function(struct compiler *c, stmt_ty s)
static int static int
compiler_class(struct compiler *c, stmt_ty s) compiler_class(struct compiler *c, stmt_ty s)
{ {
static PyObject *locals = NULL;
PyCodeObject *co; PyCodeObject *co;
PyObject *str; PyObject *str;
PySTEntryObject *ste; int i;
int err, i;
asdl_seq* decos = s->v.ClassDef.decorator_list; asdl_seq* decos = s->v.ClassDef.decorator_list;
if (!compiler_decorators(c, decos)) if (!compiler_decorators(c, decos))
return 0; return 0;
/* initialize statics */
if (locals == NULL) {
locals = PyUnicode_InternFromString("__locals__");
if (locals == NULL)
return 0;
}
/* ultimately generate code for: /* ultimately generate code for:
<name> = __build_class__(<func>, <name>, *<bases>, **<keywords>) <name> = __build_class__(<func>, <name>, *<bases>, **<keywords>)
where: where:
@ -1553,16 +1544,6 @@ compiler_class(struct compiler *c, stmt_ty s)
This borrows from compiler_call. This borrows from compiler_call.
*/ */
/* 0. Create a fake argument named __locals__ */
ste = PySymtable_Lookup(c->c_st, s);
if (ste == NULL)
return 0;
assert(PyList_Check(ste->ste_varnames));
err = PyList_Append(ste->ste_varnames, locals);
Py_DECREF(ste);
if (err < 0)
return 0;
/* 1. compile the class body into a code object */ /* 1. compile the class body into a code object */
if (!compiler_enter_scope(c, s->v.ClassDef.name, (void *)s, s->lineno)) if (!compiler_enter_scope(c, s->v.ClassDef.name, (void *)s, s->lineno))
return 0; return 0;

7
Python/symtable.c
View file

@ -186,7 +186,8 @@ static int symtable_visit_annotations(struct symtable *st, stmt_ty s);
static identifier top = NULL, lambda = NULL, genexpr = NULL, static identifier top = NULL, lambda = NULL, genexpr = NULL,
listcomp = NULL, setcomp = NULL, dictcomp = NULL, __class__ = NULL; listcomp = NULL, setcomp = NULL, dictcomp = NULL,
__class__ = NULL, __locals__ = NULL;
#define GET_IDENTIFIER(VAR) \ #define GET_IDENTIFIER(VAR) \
((VAR) ? (VAR) : ((VAR) = PyUnicode_InternFromString(# VAR))) ((VAR) ? (VAR) : ((VAR) = PyUnicode_InternFromString(# VAR)))
@ -1050,7 +1051,9 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
(void *)s, s->lineno)) (void *)s, s->lineno))
return 0; return 0;
if (!GET_IDENTIFIER(__class__) || if (!GET_IDENTIFIER(__class__) ||
!symtable_add_def(st, __class__, DEF_LOCAL)) { !symtable_add_def(st, __class__, DEF_LOCAL) ||
!GET_IDENTIFIER(__locals__) ||
!symtable_add_def(st, __locals__, DEF_PARAM)) {
symtable_exit_block(st, s); symtable_exit_block(st, s);
return 0; return 0;
} }