cpython/Python/ceval.c

3475 lines
77 KiB
C
Raw Normal View History

1991-02-19 08:39:46 -04:00
1990-12-20 11:06:42 -04:00
/* Execute compiled code */
1990-11-18 13:27:39 -04:00
1995-07-18 11:51:37 -03:00
/* XXX TO DO:
XXX how to pass arguments to call_trace?
XXX speed up searching for keywords by using a dictionary
XXX document it!
*/
1997-04-29 15:18:01 -03:00
#include "Python.h"
1990-11-18 13:27:39 -04:00
#include "compile.h"
1990-12-20 11:06:42 -04:00
#include "frameobject.h"
#include "eval.h"
1990-11-18 13:27:39 -04:00
#include "opcode.h"
#ifdef macintosh
#include "macglue.h"
#endif
#include <ctype.h>
/* Turn this on if your compiler chokes on the big switch: */
/* #define CASE_TOO_BIG 1 */
1996-12-30 12:17:54 -04:00
#ifdef Py_DEBUG
1992-01-11 22:29:51 -04:00
/* For debugging the interpreter: */
#define LLTRACE 1 /* Low-level trace feature */
#define CHECKEXC 1 /* Double-check exception checking */
1990-11-18 13:27:39 -04:00
#endif
typedef PyObject *(*callproc)(PyObject *, PyObject *, PyObject *);
/* Forward declarations */
static PyObject *eval_code2(PyCodeObject *,
PyObject *, PyObject *,
PyObject **, int,
PyObject **, int,
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
PyObject **, int,
PyObject *);
static PyObject *call_object(PyObject *, PyObject *, PyObject *);
static PyObject *call_cfunction(PyObject *, PyObject *, PyObject *);
static PyObject *call_instance(PyObject *, PyObject *, PyObject *);
static PyObject *call_method(PyObject *, PyObject *, PyObject *);
static PyObject *call_eval_code2(PyObject *, PyObject *, PyObject *);
static PyObject *fast_function(PyObject *, PyObject ***, int, int, int);
static PyObject *fast_cfunction(PyObject *, PyObject ***, int);
static PyObject *do_call(PyObject *, PyObject ***, int, int);
static PyObject *ext_do_call(PyObject *, PyObject ***, int, int, int);
static PyObject *update_keyword_args(PyObject *, int, PyObject ***,PyObject *);
static PyObject *update_star_args(int, int, PyObject *, PyObject ***);
static PyObject *load_args(PyObject ***, int);
#define CALL_FLAG_VAR 1
#define CALL_FLAG_KW 2
#ifdef LLTRACE
static int prtrace(PyObject *, char *);
#endif
static void call_exc_trace(PyObject **, PyObject**, PyFrameObject *);
static int call_trace(PyObject **, PyObject **,
PyFrameObject *, char *, PyObject *);
static PyObject *loop_subscript(PyObject *, PyObject *);
static PyObject *apply_slice(PyObject *, PyObject *, PyObject *);
static int assign_slice(PyObject *, PyObject *,
PyObject *, PyObject *);
static PyObject *cmp_outcome(int, PyObject *, PyObject *);
static PyObject *import_from(PyObject *, PyObject *);
static int import_all_from(PyObject *, PyObject *);
static PyObject *build_class(PyObject *, PyObject *, PyObject *);
static int exec_statement(PyFrameObject *,
PyObject *, PyObject *, PyObject *);
static void set_exc_info(PyThreadState *, PyObject *, PyObject *, PyObject *);
static void reset_exc_info(PyThreadState *);
static void format_exc_check_arg(PyObject *, char *, PyObject *);
#define NAME_ERROR_MSG \
"name '%.200s' is not defined"
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
#define GLOBAL_NAME_ERROR_MSG \
"global name '%.200s' is not defined"
#define UNBOUNDLOCAL_ERROR_MSG \
"local variable '%.200s' referenced before assignment"
1990-11-18 13:27:39 -04:00
/* Dynamic execution profile */
#ifdef DYNAMIC_EXECUTION_PROFILE
#ifdef DXPAIRS
static long dxpairs[257][256];
#define dxp dxpairs[256]
#else
static long dxp[256];
#endif
#endif
#ifdef WITH_THREAD
#ifndef DONT_HAVE_ERRNO_H
#include <errno.h>
#endif
1998-10-01 17:42:43 -03:00
#include "pythread.h"
extern int _PyThread_Started; /* Flag for Py_Exit */
static PyThread_type_lock interpreter_lock = 0;
static long main_thread = 0;
void
PyEval_InitThreads(void)
{
if (interpreter_lock)
return;
_PyThread_Started = 1;
interpreter_lock = PyThread_allocate_lock();
PyThread_acquire_lock(interpreter_lock, 1);
main_thread = PyThread_get_thread_ident();
}
void
PyEval_AcquireLock(void)
{
PyThread_acquire_lock(interpreter_lock, 1);
}
void
PyEval_ReleaseLock(void)
{
PyThread_release_lock(interpreter_lock);
}
void
PyEval_AcquireThread(PyThreadState *tstate)
{
if (tstate == NULL)
Py_FatalError("PyEval_AcquireThread: NULL new thread state");
PyThread_acquire_lock(interpreter_lock, 1);
if (PyThreadState_Swap(tstate) != NULL)
Py_FatalError(
"PyEval_AcquireThread: non-NULL old thread state");
}
void
PyEval_ReleaseThread(PyThreadState *tstate)
{
if (tstate == NULL)
Py_FatalError("PyEval_ReleaseThread: NULL thread state");
if (PyThreadState_Swap(NULL) != tstate)
Py_FatalError("PyEval_ReleaseThread: wrong thread state");
PyThread_release_lock(interpreter_lock);
}
/* This function is called from PyOS_AfterFork to ensure that newly
created child processes don't hold locks referring to threads which
are not running in the child process. (This could also be done using
pthread_atfork mechanism, at least for the pthreads implementation.) */
void
PyEval_ReInitThreads(void)
{
if (!interpreter_lock)
return;
/*XXX Can't use PyThread_free_lock here because it does too
much error-checking. Doing this cleanly would require
adding a new function to each thread_*.h. Instead, just
create a new lock and waste a little bit of memory */
interpreter_lock = PyThread_allocate_lock();
PyThread_acquire_lock(interpreter_lock, 1);
main_thread = PyThread_get_thread_ident();
}
#endif
/* Functions save_thread and restore_thread are always defined so
dynamically loaded modules needn't be compiled separately for use
with and without threads: */
PyThreadState *
PyEval_SaveThread(void)
{
PyThreadState *tstate = PyThreadState_Swap(NULL);
if (tstate == NULL)
Py_FatalError("PyEval_SaveThread: NULL tstate");
#ifdef WITH_THREAD
if (interpreter_lock)
PyThread_release_lock(interpreter_lock);
#endif
return tstate;
}
void
PyEval_RestoreThread(PyThreadState *tstate)
{
if (tstate == NULL)
Py_FatalError("PyEval_RestoreThread: NULL tstate");
#ifdef WITH_THREAD
if (interpreter_lock) {
int err = errno;
PyThread_acquire_lock(interpreter_lock, 1);
errno = err;
}
#endif
PyThreadState_Swap(tstate);
}
/* Mechanism whereby asynchronously executing callbacks (e.g. UNIX
signal handlers or Mac I/O completion routines) can schedule calls
to a function to be called synchronously.
The synchronous function is called with one void* argument.
It should return 0 for success or -1 for failure -- failure should
be accompanied by an exception.
If registry succeeds, the registry function returns 0; if it fails
(e.g. due to too many pending calls) it returns -1 (without setting
an exception condition).
Note that because registry may occur from within signal handlers,
or other asynchronous events, calling malloc() is unsafe!
#ifdef WITH_THREAD
Any thread can schedule pending calls, but only the main thread
will execute them.
#endif
XXX WARNING! ASYNCHRONOUSLY EXECUTING CODE!
There are two possible race conditions:
(1) nested asynchronous registry calls;
(2) registry calls made while pending calls are being processed.
While (1) is very unlikely, (2) is a real possibility.
The current code is safe against (2), but not against (1).
The safety against (2) is derived from the fact that only one
thread (the main thread) ever takes things out of the queue.
XXX Darn! With the advent of thread state, we should have an array
of pending calls per thread in the thread state! Later...
*/
1996-07-30 13:49:37 -03:00
#define NPENDINGCALLS 32
static struct {
int (*func)(void *);
void *arg;
} pendingcalls[NPENDINGCALLS];
static volatile int pendingfirst = 0;
static volatile int pendinglast = 0;
static volatile int things_to_do = 0;
int
Py_AddPendingCall(int (*func)(void *), void *arg)
{
static int busy = 0;
int i, j;
/* XXX Begin critical section */
/* XXX If you want this to be safe against nested
XXX asynchronous calls, you'll have to work harder! */
if (busy)
return -1;
busy = 1;
i = pendinglast;
j = (i + 1) % NPENDINGCALLS;
if (j == pendingfirst)
return -1; /* Queue full */
pendingcalls[i].func = func;
pendingcalls[i].arg = arg;
pendinglast = j;
things_to_do = 1; /* Signal main loop */
busy = 0;
/* XXX End critical section */
return 0;
}
int
Py_MakePendingCalls(void)
{
static int busy = 0;
#ifdef WITH_THREAD
if (main_thread && PyThread_get_thread_ident() != main_thread)
return 0;
#endif
if (busy)
return 0;
busy = 1;
things_to_do = 0;
for (;;) {
int i;
int (*func)(void *);
void *arg;
i = pendingfirst;
if (i == pendinglast)
break; /* Queue empty */
func = pendingcalls[i].func;
arg = pendingcalls[i].arg;
pendingfirst = (i + 1) % NPENDINGCALLS;
if (func(arg) < 0) {
busy = 0;
things_to_do = 1; /* We're not done yet */
return -1;
}
}
busy = 0;
return 0;
}
/* The interpreter's recursion limit */
static int recursion_limit = 1000;
int
Py_GetRecursionLimit(void)
{
return recursion_limit;
}
void
Py_SetRecursionLimit(int new_limit)
{
recursion_limit = new_limit;
}
/* Status code for main loop (reason for stack unwind) */
enum why_code {
WHY_NOT, /* No error */
WHY_EXCEPTION, /* Exception occurred */
WHY_RERAISE, /* Exception re-raised by 'finally' */
WHY_RETURN, /* 'return' statement */
WHY_BREAK, /* 'break' statement */
WHY_CONTINUE /* 'continue' statement */
};
1990-11-18 13:27:39 -04:00
static enum why_code do_raise(PyObject *, PyObject *, PyObject *);
static int unpack_sequence(PyObject *, int, PyObject **);
1990-11-18 13:27:39 -04:00
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_EvalCode(PyCodeObject *co, PyObject *globals, PyObject *locals)
1995-07-18 11:51:37 -03:00
{
return eval_code2(co,
globals, locals,
1997-04-29 15:18:01 -03:00
(PyObject **)NULL, 0,
(PyObject **)NULL, 0,
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
(PyObject **)NULL, 0,
NULL);
1995-07-18 11:51:37 -03:00
}
/* Interpreter main loop */
1997-04-29 15:18:01 -03:00
static PyObject *
eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals,
PyObject **args, int argcount, PyObject **kws, int kwcount,
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
PyObject **defs, int defcount, PyObject *closure)
1990-11-18 13:27:39 -04:00
{
#ifdef DXPAIRS
int lastopcode = 0;
#endif
PyObject **stack_pointer;
register unsigned char *next_instr;
register int opcode=0; /* Current opcode */
register int oparg=0; /* Current opcode argument, if any */
register enum why_code why; /* Reason for block stack unwind */
register int err; /* Error status -- nonzero if error */
1997-04-29 15:18:01 -03:00
register PyObject *x; /* Result object -- NULL if error */
register PyObject *v; /* Temporary objects popped off stack */
register PyObject *w;
register PyObject *u;
register PyObject *t;
register PyObject *stream = NULL; /* for PRINT opcodes */
1997-04-29 15:18:01 -03:00
register PyFrameObject *f; /* Current frame */
register PyObject **fastlocals, **freevars;
PyObject *retval = NULL; /* Return value */
1998-12-21 14:33:30 -04:00
PyThreadState *tstate = PyThreadState_GET();
unsigned char *first_instr;
1992-01-11 22:29:51 -04:00
#ifdef LLTRACE
int lltrace;
#endif
1996-12-30 12:17:54 -04:00
#if defined(Py_DEBUG) || defined(LLTRACE)
1995-07-18 11:51:37 -03:00
/* Make it easier to find out where we are with a debugger */
1997-04-29 15:18:01 -03:00
char *filename = PyString_AsString(co->co_filename);
#endif
1990-11-18 13:27:39 -04:00
/* Code access macros */
1990-12-20 11:06:42 -04:00
#define GETCONST(i) Getconst(f, i)
#define GETNAME(i) Getname(f, i)
#define GETNAMEV(i) Getnamev(f, i)
#define INSTR_OFFSET() (next_instr - first_instr)
#define NEXTOP() (*next_instr++)
#define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
#define JUMPTO(x) (next_instr = first_instr + (x))
#define JUMPBY(x) (next_instr += (x))
1990-12-20 11:06:42 -04:00
/* Stack manipulation macros */
1990-11-18 13:27:39 -04:00
#define STACK_LEVEL() (stack_pointer - f->f_valuestack)
#define EMPTY() (STACK_LEVEL() == 0)
#define TOP() (stack_pointer[-1])
#define BASIC_PUSH(v) (*stack_pointer++ = (v))
#define BASIC_POP() (*--stack_pointer)
1990-11-18 13:27:39 -04:00
1992-01-11 22:29:51 -04:00
#ifdef LLTRACE
#define PUSH(v) (BASIC_PUSH(v), lltrace && prtrace(TOP(), "push"))
#define POP() (lltrace && prtrace(TOP(), "pop"), BASIC_POP())
#else
#define PUSH(v) BASIC_PUSH(v)
#define POP() BASIC_POP()
#endif
1990-11-18 13:27:39 -04:00
1995-07-18 11:51:37 -03:00
/* Local variable macros */
#define GETLOCAL(i) (fastlocals[i])
1997-04-29 15:18:01 -03:00
#define SETLOCAL(i, value) do { Py_XDECREF(GETLOCAL(i)); \
1995-07-18 11:51:37 -03:00
GETLOCAL(i) = value; } while (0)
/* Start of code */
1996-07-30 13:49:37 -03:00
#ifdef USE_STACKCHECK
if (tstate->recursion_depth%10 == 0 && PyOS_CheckStack()) {
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_MemoryError, "Stack overflow");
1996-07-30 13:49:37 -03:00
return NULL;
}
#endif
1995-07-18 11:51:37 -03:00
if (globals == NULL) {
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_SystemError, "eval_code2: NULL globals");
return NULL;
}
#ifdef LLTRACE
1997-04-29 15:18:01 -03:00
lltrace = PyDict_GetItemString(globals, "__lltrace__") != NULL;
#endif
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
f = PyFrame_New(tstate, /*back*/
co, /*code*/
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
globals, locals, closure);
if (f == NULL)
return NULL;
1995-07-18 11:51:37 -03:00
tstate->frame = f;
fastlocals = f->f_localsplus;
freevars = f->f_localsplus + f->f_nlocals;
1995-07-18 11:51:37 -03:00
if (co->co_argcount > 0 ||
co->co_flags & (CO_VARARGS | CO_VARKEYWORDS)) {
int i;
int n = argcount;
1997-04-29 15:18:01 -03:00
PyObject *kwdict = NULL;
1995-07-18 11:51:37 -03:00
if (co->co_flags & CO_VARKEYWORDS) {
1997-04-29 15:18:01 -03:00
kwdict = PyDict_New();
1995-07-18 11:51:37 -03:00
if (kwdict == NULL)
goto fail;
i = co->co_argcount;
if (co->co_flags & CO_VARARGS)
i++;
SETLOCAL(i, kwdict);
1995-07-18 11:51:37 -03:00
}
if (argcount > co->co_argcount) {
if (!(co->co_flags & CO_VARARGS)) {
PyErr_Format(PyExc_TypeError,
"%.200s() takes %s %d "
"%sargument%s (%d given)",
PyString_AsString(co->co_name),
defcount ? "at most" : "exactly",
co->co_argcount,
kwcount ? "non-keyword " : "",
co->co_argcount == 1 ? "" : "s",
argcount);
1995-07-18 11:51:37 -03:00
goto fail;
}
n = co->co_argcount;
}
for (i = 0; i < n; i++) {
x = args[i];
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
1995-07-18 11:51:37 -03:00
SETLOCAL(i, x);
}
if (co->co_flags & CO_VARARGS) {
1997-04-29 15:18:01 -03:00
u = PyTuple_New(argcount - n);
if (u == NULL)
goto fail;
SETLOCAL(co->co_argcount, u);
1995-07-18 11:51:37 -03:00
for (i = n; i < argcount; i++) {
x = args[i];
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
PyTuple_SET_ITEM(u, i-n, x);
1995-07-18 11:51:37 -03:00
}
}
for (i = 0; i < kwcount; i++) {
1997-04-29 15:18:01 -03:00
PyObject *keyword = kws[2*i];
PyObject *value = kws[2*i + 1];
1995-07-18 11:51:37 -03:00
int j;
if (keyword == NULL || !PyString_Check(keyword)) {
PyErr_Format(PyExc_TypeError,
"%.200s() keywords must be strings",
PyString_AsString(co->co_name));
goto fail;
}
1995-07-18 11:51:37 -03:00
/* XXX slow -- speed up using dictionary? */
for (j = 0; j < co->co_argcount; j++) {
PyObject *nm = PyTuple_GET_ITEM(
co->co_varnames, j);
int cmp = PyObject_RichCompareBool(
keyword, nm, Py_EQ);
if (cmp > 0)
1995-07-18 11:51:37 -03:00
break;
else if (cmp < 0)
goto fail;
1995-07-18 11:51:37 -03:00
}
/* Check errors from Compare */
if (PyErr_Occurred())
goto fail;
1995-07-18 11:51:37 -03:00
if (j >= co->co_argcount) {
if (kwdict == NULL) {
1997-04-29 15:18:01 -03:00
PyErr_Format(PyExc_TypeError,
"%.200s() got an unexpected "
"keyword argument '%.400s'",
PyString_AsString(co->co_name),
PyString_AsString(keyword));
1995-07-18 11:51:37 -03:00
goto fail;
}
1997-04-29 15:18:01 -03:00
PyDict_SetItem(kwdict, keyword, value);
1995-07-18 11:51:37 -03:00
}
else {
if (GETLOCAL(j) != NULL) {
PyErr_Format(PyExc_TypeError,
"%.200s() got multiple "
"values for keyword "
"argument '%.400s'",
PyString_AsString(co->co_name),
PyString_AsString(keyword));
1995-07-18 11:51:37 -03:00
goto fail;
}
1997-04-29 15:18:01 -03:00
Py_INCREF(value);
1995-07-18 11:51:37 -03:00
SETLOCAL(j, value);
}
}
if (argcount < co->co_argcount) {
int m = co->co_argcount - defcount;
for (i = argcount; i < m; i++) {
if (GETLOCAL(i) == NULL) {
PyErr_Format(PyExc_TypeError,
"%.200s() takes %s %d "
"%sargument%s (%d given)",
PyString_AsString(co->co_name),
((co->co_flags & CO_VARARGS) ||
defcount) ? "at least"
: "exactly",
m, kwcount ? "non-keyword " : "",
m == 1 ? "" : "s", i);
1995-07-18 11:51:37 -03:00
goto fail;
}
}
if (n > m)
i = n - m;
else
i = 0;
for (; i < defcount; i++) {
if (GETLOCAL(m+i) == NULL) {
1997-04-29 15:18:01 -03:00
PyObject *def = defs[i];
Py_INCREF(def);
1995-07-18 11:51:37 -03:00
SETLOCAL(m+i, def);
}
}
}
}
else {
if (argcount > 0 || kwcount > 0) {
PyErr_Format(PyExc_TypeError,
"%.200s() takes no arguments (%d given)",
PyString_AsString(co->co_name),
argcount + kwcount);
goto fail;
1995-07-18 11:51:37 -03:00
}
}
/* Allocate storage for cell vars and copy free vars into frame */
if (f->f_ncells) {
int i;
for (i = 0; i < f->f_ncells; ++i)
freevars[i] = PyCell_New(NULL);
}
if (f->f_nfreevars) {
int i;
for (i = 0; i < f->f_nfreevars; ++i)
freevars[f->f_ncells + i] = PyTuple_GET_ITEM(closure, i);
}
1995-07-18 11:51:37 -03:00
if (tstate->sys_tracefunc != NULL) {
/* tstate->sys_tracefunc, if defined, is a function that
will be called on *every* entry to a code block.
1992-01-11 22:29:51 -04:00
Its return value, if not None, is a function that
will be called at the start of each executed line
of code. (Actually, the function must return
itself in order to continue tracing.)
The trace functions are called with three arguments:
a pointer to the current frame, a string indicating
why the function is called, and an argument which
depends on the situation. The global trace function
(sys.trace) is also called whenever an exception
is detected. */
if (call_trace(&tstate->sys_tracefunc,
&f->f_trace, f, "call",
1997-04-29 15:18:01 -03:00
Py_None/*XXX how to compute arguments now?*/)) {
1992-01-11 22:29:51 -04:00
/* Trace function raised an error */
goto fail;
1992-01-11 22:29:51 -04:00
}
}
if (tstate->sys_profilefunc != NULL) {
/* Similar for sys_profilefunc, except it needn't return
itself and isn't called for "line" events */
if (call_trace(&tstate->sys_profilefunc,
(PyObject**)0, f, "call",
1997-04-29 15:18:01 -03:00
Py_None/*XXX*/)) {
goto fail;
1992-01-11 22:29:51 -04:00
}
}
if (++tstate->recursion_depth > recursion_limit) {
--tstate->recursion_depth;
PyErr_SetString(PyExc_RuntimeError,
"maximum recursion depth exceeded");
tstate->frame = f->f_back;
1997-04-29 15:18:01 -03:00
Py_DECREF(f);
1996-07-30 13:49:37 -03:00
return NULL;
}
_PyCode_GETCODEPTR(co, &first_instr);
next_instr = first_instr;
stack_pointer = f->f_valuestack;
why = WHY_NOT;
err = 0;
1997-04-29 15:18:01 -03:00
x = Py_None; /* Not a reference, just anything non-NULL */
w = NULL;
for (;;) {
/* Do periodic things. Doing this every time through
the loop would add too much overhead, so we do it
only every Nth instruction. We also do it if
``things_to_do'' is set, i.e. when an asynchronous
event needs attention (e.g. a signal handler or
async I/O handler); see Py_AddPendingCall() and
Py_MakePendingCalls() above. */
if (things_to_do || --tstate->ticker < 0) {
tstate->ticker = tstate->interp->checkinterval;
if (things_to_do) {
1996-07-30 13:49:37 -03:00
if (Py_MakePendingCalls() < 0) {
why = WHY_EXCEPTION;
goto on_error;
}
}
#if !defined(HAVE_SIGNAL_H) || defined(macintosh)
/* If we have true signals, the signal handler
will call Py_AddPendingCall() so we don't
have to call sigcheck(). On the Mac and
DOS, alas, we have to call it. */
1997-04-29 15:18:01 -03:00
if (PyErr_CheckSignals()) {
why = WHY_EXCEPTION;
goto on_error;
}
#endif
#ifdef WITH_THREAD
if (interpreter_lock) {
/* Give another thread a chance */
if (PyThreadState_Swap(NULL) != tstate)
Py_FatalError("ceval: tstate mix-up");
PyThread_release_lock(interpreter_lock);
/* Other threads may run now */
PyThread_acquire_lock(interpreter_lock, 1);
if (PyThreadState_Swap(tstate) != NULL)
Py_FatalError("ceval: orphan tstate");
}
#endif
1990-11-18 13:27:39 -04:00
}
/* Extract opcode and argument */
1996-12-30 12:17:54 -04:00
#if defined(Py_DEBUG) || defined(LLTRACE)
f->f_lasti = INSTR_OFFSET();
#endif
opcode = NEXTOP();
if (HAS_ARG(opcode))
oparg = NEXTARG();
dispatch_opcode:
#ifdef DYNAMIC_EXECUTION_PROFILE
#ifdef DXPAIRS
dxpairs[lastopcode][opcode]++;
lastopcode = opcode;
#endif
dxp[opcode]++;
#endif
1990-11-18 13:27:39 -04:00
1992-01-11 22:29:51 -04:00
#ifdef LLTRACE
/* Instruction tracing */
1992-01-11 22:29:51 -04:00
if (lltrace) {
if (HAS_ARG(opcode)) {
printf("%d: %d, %d\n",
(int) (INSTR_OFFSET() - 3),
opcode, oparg);
}
else {
printf("%d: %d\n",
(int) (INSTR_OFFSET() - 1), opcode);
}
}
#endif
1990-12-20 11:06:42 -04:00
/* Main switch on opcode */
1990-12-20 11:06:42 -04:00
switch (opcode) {
1990-12-20 11:06:42 -04:00
/* BEWARE!
It is essential that any operation that fails sets either
x to NULL, err to nonzero, or why to anything but WHY_NOT,
and that no operation that succeeds does this! */
1990-12-20 11:06:42 -04:00
/* case STOP_CODE: this is an error! */
1990-11-18 13:27:39 -04:00
case POP_TOP:
v = POP();
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
continue;
1990-11-18 13:27:39 -04:00
case ROT_TWO:
v = POP();
w = POP();
PUSH(v);
PUSH(w);
continue;
1990-11-18 13:27:39 -04:00
case ROT_THREE:
v = POP();
w = POP();
x = POP();
PUSH(v);
PUSH(x);
PUSH(w);
continue;
case ROT_FOUR:
u = POP();
v = POP();
w = POP();
x = POP();
PUSH(u);
PUSH(x);
PUSH(w);
PUSH(v);
continue;
1990-12-20 11:06:42 -04:00
case DUP_TOP:
v = TOP();
1997-04-29 15:18:01 -03:00
Py_INCREF(v);
1990-12-20 11:06:42 -04:00
PUSH(v);
continue;
case DUP_TOPX:
switch (oparg) {
case 1:
x = TOP();
Py_INCREF(x);
PUSH(x);
continue;
case 2:
x = POP();
Py_INCREF(x);
w = TOP();
Py_INCREF(w);
PUSH(x);
PUSH(w);
PUSH(x);
continue;
case 3:
x = POP();
Py_INCREF(x);
w = POP();
Py_INCREF(w);
v = TOP();
Py_INCREF(v);
PUSH(w);
PUSH(x);
PUSH(v);
PUSH(w);
PUSH(x);
continue;
case 4:
x = POP();
Py_INCREF(x);
w = POP();
Py_INCREF(w);
v = POP();
Py_INCREF(v);
u = TOP();
Py_INCREF(u);
PUSH(v);
PUSH(w);
PUSH(x);
PUSH(u);
PUSH(v);
PUSH(w);
PUSH(x);
continue;
case 5:
x = POP();
Py_INCREF(x);
w = POP();
Py_INCREF(w);
v = POP();
Py_INCREF(v);
u = POP();
Py_INCREF(u);
t = TOP();
Py_INCREF(t);
PUSH(u);
PUSH(v);
PUSH(w);
PUSH(x);
PUSH(t);
PUSH(u);
PUSH(v);
PUSH(w);
PUSH(x);
continue;
default:
Py_FatalError("invalid argument to DUP_TOPX"
" (bytecode corruption?)");
}
break;
1990-11-18 13:27:39 -04:00
case UNARY_POSITIVE:
v = POP();
x = PyNumber_Positive(v);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case UNARY_NEGATIVE:
v = POP();
x = PyNumber_Negative(v);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case UNARY_NOT:
v = POP();
err = PyObject_IsTrue(v);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
if (err == 0) {
Py_INCREF(Py_True);
PUSH(Py_True);
continue;
}
else if (err > 0) {
Py_INCREF(Py_False);
PUSH(Py_False);
err = 0;
continue;
}
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case UNARY_CONVERT:
v = POP();
1997-04-29 15:18:01 -03:00
x = PyObject_Repr(v);
Py_DECREF(v);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1991-10-24 11:59:31 -03:00
case UNARY_INVERT:
v = POP();
x = PyNumber_Invert(v);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1991-10-24 11:59:31 -03:00
PUSH(x);
if (x != NULL) continue;
1991-10-24 11:59:31 -03:00
break;
case BINARY_POWER:
w = POP();
v = POP();
x = PyNumber_Power(v, w, Py_None);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
1990-11-18 13:27:39 -04:00
case BINARY_MULTIPLY:
w = POP();
v = POP();
x = PyNumber_Multiply(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case BINARY_DIVIDE:
w = POP();
v = POP();
x = PyNumber_Divide(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case BINARY_MODULO:
w = POP();
v = POP();
x = PyNumber_Remainder(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case BINARY_ADD:
w = POP();
v = POP();
if (PyInt_Check(v) && PyInt_Check(w)) {
/* INLINE: int + int */
register long a, b, i;
a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w);
i = a + b;
if ((i^a) < 0 && (i^b) < 0) {
PyErr_SetString(PyExc_OverflowError,
"integer addition");
x = NULL;
}
else
x = PyInt_FromLong(i);
}
else
x = PyNumber_Add(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case BINARY_SUBTRACT:
w = POP();
v = POP();
if (PyInt_Check(v) && PyInt_Check(w)) {
/* INLINE: int - int */
register long a, b, i;
a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w);
i = a - b;
if ((i^a) < 0 && (i^~b) < 0) {
PyErr_SetString(PyExc_OverflowError,
"integer subtraction");
x = NULL;
}
else
x = PyInt_FromLong(i);
}
else
x = PyNumber_Subtract(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case BINARY_SUBSCR:
w = POP();
v = POP();
if (PyList_Check(v) && PyInt_Check(w)) {
/* INLINE: list[int] */
long i = PyInt_AsLong(w);
if (i < 0)
i += PyList_GET_SIZE(v);
if (i < 0 ||
i >= PyList_GET_SIZE(v)) {
PyErr_SetString(PyExc_IndexError,
"list index out of range");
x = NULL;
}
else {
x = PyList_GET_ITEM(v, i);
Py_INCREF(x);
}
}
else
x = PyObject_GetItem(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1991-10-24 11:59:31 -03:00
case BINARY_LSHIFT:
w = POP();
v = POP();
x = PyNumber_Lshift(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1991-10-24 11:59:31 -03:00
PUSH(x);
if (x != NULL) continue;
1991-10-24 11:59:31 -03:00
break;
1991-10-24 11:59:31 -03:00
case BINARY_RSHIFT:
w = POP();
v = POP();
x = PyNumber_Rshift(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1991-10-24 11:59:31 -03:00
PUSH(x);
if (x != NULL) continue;
1991-10-24 11:59:31 -03:00
break;
1991-10-24 11:59:31 -03:00
case BINARY_AND:
w = POP();
v = POP();
x = PyNumber_And(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1991-10-24 11:59:31 -03:00
PUSH(x);
if (x != NULL) continue;
1991-10-24 11:59:31 -03:00
break;
1991-10-24 11:59:31 -03:00
case BINARY_XOR:
w = POP();
v = POP();
x = PyNumber_Xor(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1991-10-24 11:59:31 -03:00
PUSH(x);
if (x != NULL) continue;
1991-10-24 11:59:31 -03:00
break;
1991-10-24 11:59:31 -03:00
case BINARY_OR:
w = POP();
v = POP();
x = PyNumber_Or(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1991-10-24 11:59:31 -03:00
PUSH(x);
if (x != NULL) continue;
1991-10-24 11:59:31 -03:00
break;
case INPLACE_POWER:
w = POP();
v = POP();
x = PyNumber_InPlacePower(v, w, Py_None);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_MULTIPLY:
w = POP();
v = POP();
x = PyNumber_InPlaceMultiply(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_DIVIDE:
w = POP();
v = POP();
x = PyNumber_InPlaceDivide(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_MODULO:
w = POP();
v = POP();
x = PyNumber_InPlaceRemainder(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_ADD:
w = POP();
v = POP();
if (PyInt_Check(v) && PyInt_Check(w)) {
/* INLINE: int + int */
register long a, b, i;
a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w);
i = a + b;
if ((i^a) < 0 && (i^b) < 0) {
PyErr_SetString(PyExc_OverflowError,
"integer addition");
x = NULL;
}
else
x = PyInt_FromLong(i);
}
else
x = PyNumber_InPlaceAdd(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_SUBTRACT:
w = POP();
v = POP();
if (PyInt_Check(v) && PyInt_Check(w)) {
/* INLINE: int - int */
register long a, b, i;
a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w);
i = a - b;
if ((i^a) < 0 && (i^~b) < 0) {
PyErr_SetString(PyExc_OverflowError,
"integer subtraction");
x = NULL;
}
else
x = PyInt_FromLong(i);
}
else
x = PyNumber_InPlaceSubtract(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_LSHIFT:
w = POP();
v = POP();
x = PyNumber_InPlaceLshift(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_RSHIFT:
w = POP();
v = POP();
x = PyNumber_InPlaceRshift(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_AND:
w = POP();
v = POP();
x = PyNumber_InPlaceAnd(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_XOR:
w = POP();
v = POP();
x = PyNumber_InPlaceXor(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case INPLACE_OR:
w = POP();
v = POP();
x = PyNumber_InPlaceOr(v, w);
Py_DECREF(v);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
break;
case SLICE+0:
1990-11-18 13:27:39 -04:00
case SLICE+1:
case SLICE+2:
case SLICE+3:
1990-12-20 11:06:42 -04:00
if ((opcode-SLICE) & 2)
w = POP();
else
w = NULL;
1990-12-20 11:06:42 -04:00
if ((opcode-SLICE) & 1)
v = POP();
else
v = NULL;
1990-11-18 13:27:39 -04:00
u = POP();
1990-12-20 11:06:42 -04:00
x = apply_slice(u, v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
Py_XDECREF(v);
Py_XDECREF(w);
1990-11-18 13:27:39 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
case STORE_SLICE+0:
1990-11-18 13:27:39 -04:00
case STORE_SLICE+1:
case STORE_SLICE+2:
case STORE_SLICE+3:
1990-12-20 11:06:42 -04:00
if ((opcode-STORE_SLICE) & 2)
w = POP();
else
w = NULL;
1990-12-20 11:06:42 -04:00
if ((opcode-STORE_SLICE) & 1)
v = POP();
else
v = NULL;
1990-11-18 13:27:39 -04:00
u = POP();
1990-12-20 11:06:42 -04:00
t = POP();
err = assign_slice(u, v, w, t); /* u[v:w] = t */
1997-04-29 15:18:01 -03:00
Py_DECREF(t);
Py_DECREF(u);
Py_XDECREF(v);
Py_XDECREF(w);
if (err == 0) continue;
1990-11-18 13:27:39 -04:00
break;
case DELETE_SLICE+0:
1990-11-18 13:27:39 -04:00
case DELETE_SLICE+1:
case DELETE_SLICE+2:
case DELETE_SLICE+3:
1990-12-20 11:06:42 -04:00
if ((opcode-DELETE_SLICE) & 2)
w = POP();
else
w = NULL;
1990-12-20 11:06:42 -04:00
if ((opcode-DELETE_SLICE) & 1)
v = POP();
else
v = NULL;
1990-11-18 13:27:39 -04:00
u = POP();
1997-04-29 15:18:01 -03:00
err = assign_slice(u, v, w, (PyObject *)NULL);
1990-12-20 11:06:42 -04:00
/* del u[v:w] */
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
Py_XDECREF(v);
Py_XDECREF(w);
if (err == 0) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case STORE_SUBSCR:
w = POP();
v = POP();
u = POP();
/* v[w] = u */
err = PyObject_SetItem(v, w, u);
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
Py_DECREF(v);
Py_DECREF(w);
if (err == 0) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case DELETE_SUBSCR:
w = POP();
v = POP();
/* del v[w] */
err = PyObject_DelItem(v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
if (err == 0) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case PRINT_EXPR:
v = POP();
w = PySys_GetObject("displayhook");
if (w == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"lost sys.displayhook");
err = -1;
x = NULL;
}
if (err == 0) {
x = Py_BuildValue("(O)", v);
if (x == NULL)
err = -1;
}
if (err == 0) {
w = PyEval_CallObject(w, x);
Py_XDECREF(w);
if (w == NULL)
err = -1;
1997-04-29 15:18:01 -03:00
}
Py_DECREF(v);
Py_XDECREF(x);
1990-11-18 13:27:39 -04:00
break;
case PRINT_ITEM_TO:
w = stream = POP();
/* fall through to PRINT_ITEM */
1990-11-18 13:27:39 -04:00
case PRINT_ITEM:
v = POP();
if (stream == NULL || stream == Py_None) {
w = PySys_GetObject("stdout");
if (w == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"lost sys.stdout");
err = -1;
}
}
if (w != NULL && PyFile_SoftSpace(w, 1))
err = PyFile_WriteString(" ", w);
if (err == 0)
err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
1997-04-29 15:18:01 -03:00
if (err == 0 && PyString_Check(v)) {
/* XXX move into writeobject() ? */
1997-04-29 15:18:01 -03:00
char *s = PyString_AsString(v);
int len = PyString_Size(v);
1995-02-10 13:01:56 -04:00
if (len > 0 &&
isspace(Py_CHARMASK(s[len-1])) &&
s[len-1] != ' ')
1997-04-29 15:18:01 -03:00
PyFile_SoftSpace(w, 0);
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_XDECREF(stream);
stream = NULL;
if (err == 0)
continue;
1990-11-18 13:27:39 -04:00
break;
case PRINT_NEWLINE_TO:
w = stream = POP();
/* fall through to PRINT_NEWLINE */
1990-11-18 13:27:39 -04:00
case PRINT_NEWLINE:
if (stream == NULL || stream == Py_None) {
w = PySys_GetObject("stdout");
if (w == NULL)
PyErr_SetString(PyExc_RuntimeError,
"lost sys.stdout");
}
if (w != NULL) {
err = PyFile_WriteString("\n", w);
if (err == 0)
PyFile_SoftSpace(w, 0);
}
Py_XDECREF(stream);
stream = NULL;
1990-11-18 13:27:39 -04:00
break;
#ifdef CASE_TOO_BIG
default: switch (opcode) {
#endif
1990-11-18 13:27:39 -04:00
case BREAK_LOOP:
1990-12-20 11:06:42 -04:00
why = WHY_BREAK;
1990-11-18 13:27:39 -04:00
break;
case CONTINUE_LOOP:
retval = PyInt_FromLong(oparg);
why = WHY_CONTINUE;
break;
case RAISE_VARARGS:
u = v = w = NULL;
switch (oparg) {
case 3:
u = POP(); /* traceback */
/* Fallthrough */
case 2:
v = POP(); /* value */
/* Fallthrough */
case 1:
w = POP(); /* exc */
1998-04-09 18:39:57 -03:00
case 0: /* Fallthrough */
why = do_raise(w, v, u);
break;
default:
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_SystemError,
"bad RAISE_VARARGS oparg");
why = WHY_EXCEPTION;
break;
}
1990-11-18 13:27:39 -04:00
break;
case LOAD_LOCALS:
1995-07-18 11:51:37 -03:00
if ((x = f->f_locals) == NULL) {
PyErr_SetString(PyExc_SystemError,
"no locals");
1995-07-18 11:51:37 -03:00
break;
}
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
1995-07-18 11:51:37 -03:00
PUSH(x);
break;
1990-11-18 13:27:39 -04:00
case RETURN_VALUE:
1990-12-20 11:06:42 -04:00
retval = POP();
why = WHY_RETURN;
1990-11-18 13:27:39 -04:00
break;
case EXEC_STMT:
w = POP();
v = POP();
u = POP();
err = exec_statement(f, u, v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
Py_DECREF(v);
Py_DECREF(w);
break;
1990-11-18 13:27:39 -04:00
case POP_BLOCK:
1990-12-20 11:06:42 -04:00
{
1997-04-29 15:18:01 -03:00
PyTryBlock *b = PyFrame_BlockPop(f);
1990-12-20 11:06:42 -04:00
while (STACK_LEVEL() > b->b_level) {
v = POP();
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1990-12-20 11:06:42 -04:00
}
}
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case END_FINALLY:
v = POP();
1997-04-29 15:18:01 -03:00
if (PyInt_Check(v)) {
why = (enum why_code) PyInt_AsLong(v);
if (why == WHY_RETURN ||
why == CONTINUE_LOOP)
1990-12-20 11:06:42 -04:00
retval = POP();
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
else if (PyString_Check(v) || PyClass_Check(v)) {
1990-12-20 11:06:42 -04:00
w = POP();
u = POP();
1997-04-29 15:18:01 -03:00
PyErr_Restore(v, w, u);
1990-12-20 11:06:42 -04:00
why = WHY_RERAISE;
1995-07-28 20:06:00 -03:00
break;
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
else if (v != Py_None) {
PyErr_SetString(PyExc_SystemError,
1990-12-20 11:06:42 -04:00
"'finally' pops bad exception");
why = WHY_EXCEPTION;
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1990-11-18 13:27:39 -04:00
break;
case BUILD_CLASS:
u = POP();
v = POP();
w = POP();
x = build_class(u, v, w);
PUSH(x);
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
Py_DECREF(v);
Py_DECREF(w);
break;
1990-11-18 13:27:39 -04:00
case STORE_NAME:
1991-04-03 14:59:50 -04:00
w = GETNAMEV(oparg);
1990-11-18 13:27:39 -04:00
v = POP();
1995-07-18 11:51:37 -03:00
if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError,
"no locals found when storing %s",
PyObject_REPR(w));
1995-07-18 11:51:37 -03:00
break;
}
1997-04-29 15:18:01 -03:00
err = PyDict_SetItem(x, w, v);
Py_DECREF(v);
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case DELETE_NAME:
w = GETNAMEV(oparg);
1995-07-18 11:51:37 -03:00
if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError,
"no locals when deleting %s",
PyObject_REPR(w));
1995-07-18 11:51:37 -03:00
break;
}
1997-04-29 15:18:01 -03:00
if ((err = PyDict_DelItem(x, w)) != 0)
format_exc_check_arg(PyExc_NameError,
NAME_ERROR_MSG ,w);
1990-11-18 13:27:39 -04:00
break;
case UNPACK_SEQUENCE:
1990-11-18 13:27:39 -04:00
v = POP();
if (PyTuple_Check(v)) {
if (PyTuple_Size(v) != oparg) {
PyErr_SetString(PyExc_ValueError,
"unpack tuple of wrong size");
why = WHY_EXCEPTION;
}
else {
for (; --oparg >= 0; ) {
w = PyTuple_GET_ITEM(v, oparg);
Py_INCREF(w);
PUSH(w);
}
1990-11-18 13:27:39 -04:00
}
}
else if (PyList_Check(v)) {
if (PyList_Size(v) != oparg) {
PyErr_SetString(PyExc_ValueError,
"unpack list of wrong size");
why = WHY_EXCEPTION;
}
else {
for (; --oparg >= 0; ) {
w = PyList_GET_ITEM(v, oparg);
Py_INCREF(w);
PUSH(w);
}
}
1990-11-18 13:27:39 -04:00
}
else if (PySequence_Check(v)) {
if (unpack_sequence(v, oparg,
stack_pointer + oparg))
stack_pointer += oparg;
else
why = WHY_EXCEPTION;
1990-11-18 13:27:39 -04:00
}
else {
PyErr_SetString(PyExc_TypeError,
"unpack non-sequence");
why = WHY_EXCEPTION;
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case STORE_ATTR:
w = GETNAMEV(oparg);
1990-11-18 13:27:39 -04:00
v = POP();
u = POP();
1997-04-29 15:18:01 -03:00
err = PyObject_SetAttr(v, w, u); /* v.w = u */
Py_DECREF(v);
Py_DECREF(u);
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case DELETE_ATTR:
w = GETNAMEV(oparg);
1990-11-18 13:27:39 -04:00
v = POP();
err = PyObject_SetAttr(v, w, (PyObject *)NULL);
/* del v.w */
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1990-11-18 13:27:39 -04:00
break;
case STORE_GLOBAL:
w = GETNAMEV(oparg);
v = POP();
1997-04-29 15:18:01 -03:00
err = PyDict_SetItem(f->f_globals, w, v);
Py_DECREF(v);
break;
case DELETE_GLOBAL:
w = GETNAMEV(oparg);
1997-04-29 15:18:01 -03:00
if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
format_exc_check_arg(
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
PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w);
break;
1990-11-18 13:27:39 -04:00
case LOAD_CONST:
1990-12-20 11:06:42 -04:00
x = GETCONST(oparg);
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
1990-12-20 11:06:42 -04:00
PUSH(x);
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case LOAD_NAME:
w = GETNAMEV(oparg);
1995-07-18 11:51:37 -03:00
if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError,
"no locals when loading %s",
PyObject_REPR(w));
1995-07-18 11:51:37 -03:00
break;
}
1997-04-29 15:18:01 -03:00
x = PyDict_GetItem(x, w);
1990-12-20 11:06:42 -04:00
if (x == NULL) {
1997-04-29 15:18:01 -03:00
x = PyDict_GetItem(f->f_globals, w);
if (x == NULL) {
1997-04-29 15:18:01 -03:00
x = PyDict_GetItem(f->f_builtins, w);
if (x == NULL) {
format_exc_check_arg(
PyExc_NameError,
NAME_ERROR_MSG ,w);
break;
}
}
}
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
PUSH(x);
break;
case LOAD_GLOBAL:
w = GETNAMEV(oparg);
1997-04-29 15:18:01 -03:00
x = PyDict_GetItem(f->f_globals, w);
if (x == NULL) {
1997-04-29 15:18:01 -03:00
x = PyDict_GetItem(f->f_builtins, w);
if (x == NULL) {
format_exc_check_arg(
PyExc_NameError,
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
GLOBAL_NAME_ERROR_MSG ,w);
break;
}
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
1990-12-20 11:06:42 -04:00
PUSH(x);
1990-11-18 13:27:39 -04:00
break;
case LOAD_FAST:
1995-07-18 11:51:37 -03:00
x = GETLOCAL(oparg);
if (x == NULL) {
format_exc_check_arg(
PyExc_UnboundLocalError,
UNBOUNDLOCAL_ERROR_MSG,
PyTuple_GetItem(co->co_varnames, oparg)
);
break;
}
1997-04-29 15:18:01 -03:00
Py_INCREF(x);
PUSH(x);
if (x != NULL) continue;
break;
case STORE_FAST:
v = POP();
1995-07-18 11:51:37 -03:00
SETLOCAL(oparg, v);
continue;
case DELETE_FAST:
x = GETLOCAL(oparg);
if (x == NULL) {
format_exc_check_arg(
PyExc_UnboundLocalError,
UNBOUNDLOCAL_ERROR_MSG,
PyTuple_GetItem(co->co_varnames, oparg)
);
break;
}
1995-07-18 11:51:37 -03:00
SETLOCAL(oparg, NULL);
continue;
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
case LOAD_CLOSURE:
x = freevars[oparg];
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_INCREF(x);
PUSH(x);
break;
case LOAD_DEREF:
x = freevars[oparg];
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
w = PyCell_Get(x);
if (w == NULL) {
if (oparg < f->f_ncells)
v = PyTuple_GetItem(co->co_cellvars,
oparg);
else
v = PyTuple_GetItem(
co->co_freevars,
oparg - f->f_ncells);
format_exc_check_arg(
PyExc_UnboundLocalError,
UNBOUNDLOCAL_ERROR_MSG,
v);
err = -1;
break;
}
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_INCREF(w);
PUSH(w);
break;
case STORE_DEREF:
w = POP();
x = freevars[oparg];
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
PyCell_Set(x, w);
continue;
1990-11-18 13:27:39 -04:00
case BUILD_TUPLE:
1997-04-29 15:18:01 -03:00
x = PyTuple_New(oparg);
1990-12-20 11:06:42 -04:00
if (x != NULL) {
for (; --oparg >= 0;) {
1990-11-18 13:27:39 -04:00
w = POP();
1997-04-29 15:18:01 -03:00
PyTuple_SET_ITEM(x, oparg, w);
1990-11-18 13:27:39 -04:00
}
1990-12-20 11:06:42 -04:00
PUSH(x);
continue;
1990-11-18 13:27:39 -04:00
}
break;
1990-11-18 13:27:39 -04:00
case BUILD_LIST:
1997-04-29 15:18:01 -03:00
x = PyList_New(oparg);
1990-12-20 11:06:42 -04:00
if (x != NULL) {
for (; --oparg >= 0;) {
1990-11-18 13:27:39 -04:00
w = POP();
PyList_SET_ITEM(x, oparg, w);
1990-11-18 13:27:39 -04:00
}
1990-12-20 11:06:42 -04:00
PUSH(x);
continue;
1990-11-18 13:27:39 -04:00
}
break;
1990-11-18 13:27:39 -04:00
case BUILD_MAP:
1997-04-29 15:18:01 -03:00
x = PyDict_New();
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case LOAD_ATTR:
w = GETNAMEV(oparg);
1990-11-18 13:27:39 -04:00
v = POP();
1997-04-29 15:18:01 -03:00
x = PyObject_GetAttr(v, w);
Py_DECREF(v);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case COMPARE_OP:
w = POP();
v = POP();
if (PyInt_Check(v) && PyInt_Check(w)) {
/* INLINE: cmp(int, int) */
register long a, b;
register int res;
a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w);
switch (oparg) {
case LT: res = a < b; break;
case LE: res = a <= b; break;
case EQ: res = a == b; break;
case NE: res = a != b; break;
case GT: res = a > b; break;
case GE: res = a >= b; break;
case IS: res = v == w; break;
case IS_NOT: res = v != w; break;
default: goto slow_compare;
}
x = res ? Py_True : Py_False;
Py_INCREF(x);
}
else {
slow_compare:
x = cmp_outcome(oparg, v, w);
}
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
1990-11-18 13:27:39 -04:00
case IMPORT_NAME:
w = GETNAMEV(oparg);
1997-04-29 15:18:01 -03:00
x = PyDict_GetItemString(f->f_builtins, "__import__");
if (x == NULL) {
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_ImportError,
"__import__ not found");
break;
}
u = POP();
1997-04-29 15:18:01 -03:00
w = Py_BuildValue("(OOOO)",
1995-07-18 11:51:37 -03:00
w,
f->f_globals,
f->f_locals == NULL ?
Py_None : f->f_locals,
1995-07-18 11:51:37 -03:00
u);
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
if (w == NULL) {
x = NULL;
break;
}
1997-04-29 15:18:01 -03:00
x = PyEval_CallObject(x, w);
Py_DECREF(w);
PUSH(x);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
break;
case IMPORT_STAR:
v = POP();
1997-04-29 15:18:01 -03:00
PyFrame_FastToLocals(f);
1995-07-18 11:51:37 -03:00
if ((x = f->f_locals) == NULL) {
PyErr_SetString(PyExc_SystemError,
"no locals found during 'import *'");
1995-07-18 11:51:37 -03:00
break;
}
err = import_all_from(x, v);
1997-04-29 15:18:01 -03:00
PyFrame_LocalsToFast(f, 0);
Py_DECREF(v);
if (err == 0) continue;
1990-11-18 13:27:39 -04:00
break;
case IMPORT_FROM:
w = GETNAMEV(oparg);
v = TOP();
x = import_from(v, w);
PUSH(x);
if (x != NULL) continue;
break;
1990-11-18 13:27:39 -04:00
case JUMP_FORWARD:
1990-12-20 11:06:42 -04:00
JUMPBY(oparg);
continue;
1990-11-18 13:27:39 -04:00
case JUMP_IF_FALSE:
1997-04-29 15:18:01 -03:00
err = PyObject_IsTrue(TOP());
if (err > 0)
err = 0;
else if (err == 0)
1990-12-20 11:06:42 -04:00
JUMPBY(oparg);
else
break;
continue;
1990-11-18 13:27:39 -04:00
case JUMP_IF_TRUE:
1997-04-29 15:18:01 -03:00
err = PyObject_IsTrue(TOP());
if (err > 0) {
err = 0;
1990-12-20 11:06:42 -04:00
JUMPBY(oparg);
}
else if (err == 0)
;
else
break;
continue;
1990-11-18 13:27:39 -04:00
case JUMP_ABSOLUTE:
1990-12-20 11:06:42 -04:00
JUMPTO(oparg);
continue;
1990-11-18 13:27:39 -04:00
case FOR_LOOP:
/* for v in s: ...
On entry: stack contains s, i.
On exit: stack contains s, i+1, s[i];
but if loop exhausted:
s, i are popped, and we jump */
1990-11-18 13:27:39 -04:00
w = POP(); /* Loop index */
v = POP(); /* Sequence object */
1990-12-20 11:06:42 -04:00
u = loop_subscript(v, w);
if (u != NULL) {
1990-11-18 13:27:39 -04:00
PUSH(v);
1997-04-29 15:18:01 -03:00
x = PyInt_FromLong(PyInt_AsLong(w)+1);
1990-11-18 13:27:39 -04:00
PUSH(x);
1997-04-29 15:18:01 -03:00
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
PUSH(u);
if (x != NULL) continue;
1990-11-18 13:27:39 -04:00
}
else {
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
Py_DECREF(w);
1990-12-20 11:06:42 -04:00
/* A NULL can mean "s exhausted"
but also an error: */
1997-04-29 15:18:01 -03:00
if (PyErr_Occurred())
1990-12-20 11:06:42 -04:00
why = WHY_EXCEPTION;
else {
1990-12-20 11:06:42 -04:00
JUMPBY(oparg);
continue;
}
1990-11-18 13:27:39 -04:00
}
break;
1990-11-18 13:27:39 -04:00
case SETUP_LOOP:
case SETUP_EXCEPT:
1990-12-20 11:06:42 -04:00
case SETUP_FINALLY:
1997-04-29 15:18:01 -03:00
PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
STACK_LEVEL());
continue;
1990-12-20 11:06:42 -04:00
case SET_LINENO:
1992-01-11 22:29:51 -04:00
#ifdef LLTRACE
if (lltrace)
printf("--- %s:%d \n", filename, oparg);
1990-12-20 11:06:42 -04:00
#endif
1992-01-11 22:29:51 -04:00
f->f_lineno = oparg;
if (f->f_trace == NULL)
continue;
/* Trace each line of code reached */
f->f_lasti = INSTR_OFFSET();
err = call_trace(&f->f_trace, &f->f_trace,
1997-04-29 15:18:01 -03:00
f, "line", Py_None);
1990-11-18 13:27:39 -04:00
break;
case CALL_FUNCTION:
{
int na = oparg & 0xff;
int nk = (oparg>>8) & 0xff;
int n = na + 2 * nk;
PyObject **pfunc = stack_pointer - n - 1;
PyObject *func = *pfunc;
f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
/* Always dispatch PyCFunction first, because
these are presumed to be the most frequent
callable object.
*/
if (PyCFunction_Check(func)) {
if (PyCFunction_GET_FLAGS(func) == 0) {
x = fast_cfunction(func,
&stack_pointer, na);
} else {
x = do_call(func, &stack_pointer,
na, nk);
}
} else {
if (PyMethod_Check(func)
&& PyMethod_GET_SELF(func) != NULL) {
/* optimize access to bound methods */
PyObject *self = PyMethod_GET_SELF(func);
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
Py_DECREF(*pfunc);
*pfunc = self;
na++;
n++;
} else
Py_INCREF(func);
if (PyFunction_Check(func)) {
x = fast_function(func, &stack_pointer,
n, na, nk);
} else {
x = do_call(func, &stack_pointer,
na, nk);
}
Py_DECREF(func);
}
while (stack_pointer > pfunc) {
w = POP();
Py_DECREF(w);
}
PUSH(x);
if (x != NULL)
continue;
break;
}
case CALL_FUNCTION_VAR:
case CALL_FUNCTION_KW:
case CALL_FUNCTION_VAR_KW:
{
int na = oparg & 0xff;
int nk = (oparg>>8) & 0xff;
int flags = (opcode - CALL_FUNCTION) & 3;
int n = na + 2 * nk;
PyObject **pfunc, *func;
if (flags & CALL_FLAG_VAR)
n++;
if (flags & CALL_FLAG_KW)
n++;
pfunc = stack_pointer - n - 1;
func = *pfunc;
f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
if (PyMethod_Check(func)
&& PyMethod_GET_SELF(func) != NULL) {
PyObject *self = PyMethod_GET_SELF(func);
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
Py_DECREF(*pfunc);
*pfunc = self;
na++;
n++;
} else
Py_INCREF(func);
x = ext_do_call(func, &stack_pointer, flags, na, nk);
Py_DECREF(func);
while (stack_pointer > pfunc) {
w = POP();
Py_DECREF(w);
}
PUSH(x);
if (x != NULL)
continue;
break;
}
1995-07-18 11:51:37 -03:00
case MAKE_FUNCTION:
v = POP(); /* code object */
1997-04-29 15:18:01 -03:00
x = PyFunction_New(v, f->f_globals);
Py_DECREF(v);
1995-07-18 11:51:37 -03:00
/* XXX Maybe this should be a separate opcode? */
if (x != NULL && oparg > 0) {
1997-04-29 15:18:01 -03:00
v = PyTuple_New(oparg);
1995-07-18 11:51:37 -03:00
if (v == NULL) {
1997-04-29 15:18:01 -03:00
Py_DECREF(x);
1995-07-18 11:51:37 -03:00
x = NULL;
break;
}
while (--oparg >= 0) {
w = POP();
1997-04-29 15:18:01 -03:00
PyTuple_SET_ITEM(v, oparg, w);
1995-07-18 11:51:37 -03:00
}
err = PyFunction_SetDefaults(x, v);
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
1995-07-18 11:51:37 -03:00
}
PUSH(x);
break;
1996-07-30 13:49:37 -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
case MAKE_CLOSURE:
{
int nfree;
v = POP(); /* code object */
x = PyFunction_New(v, f->f_globals);
nfree = PyTuple_GET_SIZE(((PyCodeObject *)v)->co_freevars);
Py_DECREF(v);
/* XXX Maybe this should be a separate opcode? */
if (x != NULL && nfree > 0) {
v = PyTuple_New(nfree);
if (v == NULL) {
Py_DECREF(x);
x = NULL;
break;
}
while (--nfree >= 0) {
w = POP();
PyTuple_SET_ITEM(v, nfree, w);
}
err = PyFunction_SetClosure(x, v);
Py_DECREF(v);
}
if (x != NULL && oparg > 0) {
v = PyTuple_New(oparg);
if (v == NULL) {
Py_DECREF(x);
x = NULL;
break;
}
while (--oparg >= 0) {
w = POP();
PyTuple_SET_ITEM(v, oparg, w);
}
err = PyFunction_SetDefaults(x, v);
Py_DECREF(v);
}
PUSH(x);
break;
}
1996-07-30 13:49:37 -03:00
case BUILD_SLICE:
if (oparg == 3)
w = POP();
else
w = NULL;
v = POP();
u = POP();
x = PySlice_New(u, v, w);
1997-04-29 15:18:01 -03:00
Py_DECREF(u);
Py_DECREF(v);
Py_XDECREF(w);
1996-07-30 13:49:37 -03:00
PUSH(x);
if (x != NULL) continue;
1996-07-30 13:49:37 -03:00
break;
case EXTENDED_ARG:
opcode = NEXTOP();
oparg = oparg<<16 | NEXTARG();
goto dispatch_opcode;
break;
1996-07-30 13:49:37 -03:00
1990-11-18 13:27:39 -04:00
default:
1990-12-20 11:06:42 -04:00
fprintf(stderr,
"XXX lineno: %d, opcode: %d\n",
1992-01-11 22:29:51 -04:00
f->f_lineno, opcode);
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_SystemError, "unknown opcode");
1990-12-20 11:06:42 -04:00
why = WHY_EXCEPTION;
1990-11-18 13:27:39 -04:00
break;
#ifdef CASE_TOO_BIG
}
#endif
1990-12-20 11:06:42 -04:00
} /* switch */
on_error:
/* Quickly continue if no error occurred */
if (why == WHY_NOT) {
1995-07-18 11:51:37 -03:00
if (err == 0 && x != NULL) {
#ifdef CHECKEXC
/* This check is expensive! */
1997-04-29 15:18:01 -03:00
if (PyErr_Occurred())
1995-07-18 11:51:37 -03:00
fprintf(stderr,
"XXX undetected error\n");
else
#endif
continue; /* Normal, fast path */
}
why = WHY_EXCEPTION;
1997-04-29 15:18:01 -03:00
x = Py_None;
err = 0;
}
/* Double-check exception status */
if (why == WHY_EXCEPTION || why == WHY_RERAISE) {
1997-04-29 15:18:01 -03:00
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_SystemError,
"error return without exception set");
why = WHY_EXCEPTION;
}
}
#ifdef CHECKEXC
else {
/* This check is expensive! */
1997-04-29 15:18:01 -03:00
if (PyErr_Occurred()) {
1995-07-18 11:51:37 -03:00
fprintf(stderr,
"XXX undetected error (why=%d)\n",
why);
why = WHY_EXCEPTION;
}
}
#endif
/* Log traceback info if this is a real exception */
if (why == WHY_EXCEPTION) {
1992-01-11 22:29:51 -04:00
f->f_lasti = INSTR_OFFSET() - 1;
if (HAS_ARG(opcode))
1992-01-11 22:29:51 -04:00
f->f_lasti -= 2;
1997-04-29 15:18:01 -03:00
PyTraceBack_Here(f);
1992-01-11 22:29:51 -04:00
if (f->f_trace)
call_exc_trace(&f->f_trace, &f->f_trace, f);
if (tstate->sys_profilefunc)
call_exc_trace(&tstate->sys_profilefunc,
(PyObject**)0, f);
}
/* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */
if (why == WHY_RERAISE)
why = WHY_EXCEPTION;
/* Unwind stacks if a (pseudo) exception occurred */
while (why != WHY_NOT && f->f_iblock > 0) {
1997-04-29 15:18:01 -03:00
PyTryBlock *b = PyFrame_BlockPop(f);
if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
/* For a continue inside a try block,
don't pop the block for the loop. */
PyFrame_BlockSetup(f, b->b_type, b->b_level,
b->b_handler);
why = WHY_NOT;
JUMPTO(PyInt_AS_LONG(retval));
Py_DECREF(retval);
break;
}
while (STACK_LEVEL() > b->b_level) {
v = POP();
1997-04-29 15:18:01 -03:00
Py_XDECREF(v);
}
if (b->b_type == SETUP_LOOP && why == WHY_BREAK) {
why = WHY_NOT;
JUMPTO(b->b_handler);
break;
}
if (b->b_type == SETUP_FINALLY ||
(b->b_type == SETUP_EXCEPT &&
why == WHY_EXCEPTION)) {
if (why == WHY_EXCEPTION) {
1997-04-29 15:18:01 -03:00
PyObject *exc, *val, *tb;
PyErr_Fetch(&exc, &val, &tb);
if (val == NULL) {
1997-04-29 15:18:01 -03:00
val = Py_None;
Py_INCREF(val);
}
/* Make the raw exception data
available to the handler,
so a program can emulate the
Python main loop. Don't do
this for 'finally'. */
if (b->b_type == SETUP_EXCEPT) {
PyErr_NormalizeException(
&exc, &val, &tb);
set_exc_info(tstate,
exc, val, tb);
}
PUSH(tb);
PUSH(val);
PUSH(exc);
}
else {
if (why == WHY_RETURN ||
why == CONTINUE_LOOP)
PUSH(retval);
1997-04-29 15:18:01 -03:00
v = PyInt_FromLong((long)why);
PUSH(v);
}
why = WHY_NOT;
JUMPTO(b->b_handler);
break;
}
} /* unwind stack */
/* End the loop if we still have an error (or return) */
if (why != WHY_NOT)
break;
} /* main loop */
/* Pop remaining stack entries */
while (!EMPTY()) {
v = POP();
1997-04-29 15:18:01 -03:00
Py_XDECREF(v);
}
1992-01-11 22:29:51 -04:00
if (why != WHY_RETURN)
retval = NULL;
if (f->f_trace) {
1992-01-11 22:29:51 -04:00
if (why == WHY_RETURN) {
if (call_trace(&f->f_trace, &f->f_trace, f,
"return", retval)) {
1997-04-29 15:18:01 -03:00
Py_XDECREF(retval);
1992-01-11 22:29:51 -04:00
retval = NULL;
why = WHY_EXCEPTION;
1992-01-11 22:29:51 -04:00
}
}
}
if (tstate->sys_profilefunc && why == WHY_RETURN) {
if (call_trace(&tstate->sys_profilefunc, (PyObject**)0,
f, "return", retval)) {
1997-04-29 15:18:01 -03:00
Py_XDECREF(retval);
retval = NULL;
why = WHY_EXCEPTION;
}
1992-01-11 22:29:51 -04:00
}
reset_exc_info(tstate);
--tstate->recursion_depth;
fail: /* Jump here from prelude on failure */
/* Restore previous frame and release the current one */
1995-07-18 11:51:37 -03:00
tstate->frame = f->f_back;
1997-04-29 15:18:01 -03:00
Py_DECREF(f);
1992-01-11 22:29:51 -04:00
return retval;
}
static void
set_exc_info(PyThreadState *tstate,
PyObject *type, PyObject *value, PyObject *tb)
{
PyFrameObject *frame;
PyObject *tmp_type, *tmp_value, *tmp_tb;
frame = tstate->frame;
if (frame->f_exc_type == NULL) {
/* This frame didn't catch an exception before */
/* Save previous exception of this thread in this frame */
if (tstate->exc_type == NULL) {
Py_INCREF(Py_None);
tstate->exc_type = Py_None;
}
tmp_type = frame->f_exc_type;
tmp_value = frame->f_exc_value;
tmp_tb = frame->f_exc_traceback;
Py_XINCREF(tstate->exc_type);
Py_XINCREF(tstate->exc_value);
Py_XINCREF(tstate->exc_traceback);
frame->f_exc_type = tstate->exc_type;
frame->f_exc_value = tstate->exc_value;
frame->f_exc_traceback = tstate->exc_traceback;
Py_XDECREF(tmp_type);
Py_XDECREF(tmp_value);
Py_XDECREF(tmp_tb);
}
/* Set new exception for this thread */
tmp_type = tstate->exc_type;
tmp_value = tstate->exc_value;
tmp_tb = tstate->exc_traceback;
Py_XINCREF(type);
Py_XINCREF(value);
Py_XINCREF(tb);
tstate->exc_type = type;
tstate->exc_value = value;
tstate->exc_traceback = tb;
Py_XDECREF(tmp_type);
Py_XDECREF(tmp_value);
Py_XDECREF(tmp_tb);
/* For b/w compatibility */
PySys_SetObject("exc_type", type);
PySys_SetObject("exc_value", value);
PySys_SetObject("exc_traceback", tb);
}
static void
reset_exc_info(PyThreadState *tstate)
{
PyFrameObject *frame;
PyObject *tmp_type, *tmp_value, *tmp_tb;
frame = tstate->frame;
if (frame->f_exc_type != NULL) {
/* This frame caught an exception */
tmp_type = tstate->exc_type;
tmp_value = tstate->exc_value;
tmp_tb = tstate->exc_traceback;
Py_XINCREF(frame->f_exc_type);
Py_XINCREF(frame->f_exc_value);
Py_XINCREF(frame->f_exc_traceback);
tstate->exc_type = frame->f_exc_type;
tstate->exc_value = frame->f_exc_value;
tstate->exc_traceback = frame->f_exc_traceback;
Py_XDECREF(tmp_type);
Py_XDECREF(tmp_value);
Py_XDECREF(tmp_tb);
/* For b/w compatibility */
PySys_SetObject("exc_type", frame->f_exc_type);
PySys_SetObject("exc_value", frame->f_exc_value);
PySys_SetObject("exc_traceback", frame->f_exc_traceback);
}
tmp_type = frame->f_exc_type;
tmp_value = frame->f_exc_value;
tmp_tb = frame->f_exc_traceback;
frame->f_exc_type = NULL;
frame->f_exc_value = NULL;
frame->f_exc_traceback = NULL;
Py_XDECREF(tmp_type);
Py_XDECREF(tmp_value);
Py_XDECREF(tmp_tb);
}
/* Logic for the raise statement (too complicated for inlining).
This *consumes* a reference count to each of its arguments. */
static enum why_code
do_raise(PyObject *type, PyObject *value, PyObject *tb)
{
1998-04-09 18:39:57 -03:00
if (type == NULL) {
/* Reraise */
PyThreadState *tstate = PyThreadState_Get();
type = tstate->exc_type == NULL ? Py_None : tstate->exc_type;
value = tstate->exc_value;
tb = tstate->exc_traceback;
Py_XINCREF(type);
Py_XINCREF(value);
Py_XINCREF(tb);
}
/* We support the following forms of raise:
raise <class>, <classinstance>
raise <class>, <argument tuple>
raise <class>, None
raise <class>, <argument>
raise <classinstance>, None
raise <string>, <object>
raise <string>, None
An omitted second argument is the same as None.
In addition, raise <tuple>, <anything> is the same as
raising the tuple's first item (and it better have one!);
this rule is applied recursively.
Finally, an optional third argument can be supplied, which
gives the traceback to be substituted (useful when
re-raising an exception after examining it). */
/* First, check the traceback argument, replacing None with
NULL. */
1997-04-29 15:18:01 -03:00
if (tb == Py_None) {
Py_DECREF(tb);
tb = NULL;
}
else if (tb != NULL && !PyTraceBack_Check(tb)) {
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_TypeError,
"raise: arg 3 must be a traceback or None");
goto raise_error;
}
/* Next, replace a missing value with None */
if (value == NULL) {
1997-04-29 15:18:01 -03:00
value = Py_None;
Py_INCREF(value);
}
/* Next, repeatedly, replace a tuple exception with its first item */
1997-04-29 15:18:01 -03:00
while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
PyObject *tmp = type;
type = PyTuple_GET_ITEM(type, 0);
Py_INCREF(type);
Py_DECREF(tmp);
}
if (PyString_Check(type))
;
else if (PyClass_Check(type))
PyErr_NormalizeException(&type, &value, &tb);
1997-04-29 15:18:01 -03:00
else if (PyInstance_Check(type)) {
/* Raising an instance. The value should be a dummy. */
1997-04-29 15:18:01 -03:00
if (value != Py_None) {
PyErr_SetString(PyExc_TypeError,
"instance exception may not have a separate value");
goto raise_error;
}
else {
/* Normalize to raise <class>, <instance> */
1997-04-29 15:18:01 -03:00
Py_DECREF(value);
value = type;
1997-04-29 15:18:01 -03:00
type = (PyObject*) ((PyInstanceObject*)type)->in_class;
Py_INCREF(type);
}
}
else {
/* Not something you can raise. You get an exception
anyway, just not what you specified :-) */
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_TypeError,
"exceptions must be strings, classes, or instances");
goto raise_error;
}
1997-04-29 15:18:01 -03:00
PyErr_Restore(type, value, tb);
if (tb == NULL)
return WHY_EXCEPTION;
else
return WHY_RERAISE;
raise_error:
1997-04-29 15:18:01 -03:00
Py_XDECREF(value);
Py_XDECREF(type);
Py_XDECREF(tb);
return WHY_EXCEPTION;
}
static int
unpack_sequence(PyObject *v, int argcnt, PyObject **sp)
{
int i;
PyObject *w;
for (i = 0; i < argcnt; i++) {
if (! (w = PySequence_GetItem(v, i))) {
if (PyErr_ExceptionMatches(PyExc_IndexError))
PyErr_SetString(PyExc_ValueError,
"unpack sequence of wrong size");
goto finally;
}
*--sp = w;
}
/* we better get an IndexError now */
if (PySequence_GetItem(v, i) == NULL) {
if (PyErr_ExceptionMatches(PyExc_IndexError)) {
PyErr_Clear();
return 1;
}
/* some other exception occurred. fall through to finally */
}
else
PyErr_SetString(PyExc_ValueError,
"unpack sequence of wrong size");
/* fall through */
finally:
for (; i > 0; i--, sp++)
Py_DECREF(*sp);
return 0;
}
1992-01-11 22:29:51 -04:00
#ifdef LLTRACE
static int
prtrace(PyObject *v, char *str)
{
printf("%s ", str);
1997-04-29 15:18:01 -03:00
if (PyObject_Print(v, stdout, 0) != 0)
PyErr_Clear(); /* Don't know what else to do */
printf("\n");
return 1;
}
#endif
static void
call_exc_trace(PyObject **p_trace, PyObject **p_newtrace, PyFrameObject *f)
{
1997-04-29 15:18:01 -03:00
PyObject *type, *value, *traceback, *arg;
int err;
1997-04-29 15:18:01 -03:00
PyErr_Fetch(&type, &value, &traceback);
if (value == NULL) {
1997-04-29 15:18:01 -03:00
value = Py_None;
Py_INCREF(value);
}
1997-04-29 15:18:01 -03:00
arg = Py_BuildValue("(OOO)", type, value, traceback);
if (arg == NULL) {
1997-04-29 15:18:01 -03:00
PyErr_Restore(type, value, traceback);
return;
}
err = call_trace(p_trace, p_newtrace, f, "exception", arg);
1997-04-29 15:18:01 -03:00
Py_DECREF(arg);
if (err == 0)
1997-04-29 15:18:01 -03:00
PyErr_Restore(type, value, traceback);
else {
1997-04-29 15:18:01 -03:00
Py_XDECREF(type);
Py_XDECREF(value);
Py_XDECREF(traceback);
}
}
/* PyObject **p_trace: in/out; may not be NULL;
may not point to NULL variable initially
PyObject **p_newtrace: in/out; may be NULL;
may point to NULL variable;
may be same variable as p_newtrace */
static int
call_trace(PyObject **p_trace, PyObject **p_newtrace, PyFrameObject *f,
char *msg, PyObject *arg)
1992-01-11 22:29:51 -04:00
{
PyThreadState *tstate = f->f_tstate;
1997-04-29 15:18:01 -03:00
PyObject *args, *what;
PyObject *res = NULL;
if (tstate->tracing) {
/* Don't do recursive traces */
if (p_newtrace) {
1997-04-29 15:18:01 -03:00
Py_XDECREF(*p_newtrace);
*p_newtrace = NULL;
}
return 0;
1992-01-11 22:29:51 -04:00
}
1997-04-29 15:18:01 -03:00
args = PyTuple_New(3);
if (args == NULL)
goto cleanup;
1997-04-29 15:18:01 -03:00
what = PyString_FromString(msg);
if (what == NULL)
goto cleanup;
1997-04-29 15:18:01 -03:00
Py_INCREF(f);
PyTuple_SET_ITEM(args, 0, (PyObject *)f);
PyTuple_SET_ITEM(args, 1, what);
1992-01-11 22:29:51 -04:00
if (arg == NULL)
1997-04-29 15:18:01 -03:00
arg = Py_None;
Py_INCREF(arg);
PyTuple_SET_ITEM(args, 2, arg);
tstate->tracing++;
1997-04-29 15:18:01 -03:00
PyFrame_FastToLocals(f);
res = PyEval_CallObject(*p_trace, args); /* May clear *p_trace! */
PyFrame_LocalsToFast(f, 1);
tstate->tracing--;
cleanup:
1997-04-29 15:18:01 -03:00
Py_XDECREF(args);
if (res == NULL) {
/* The trace proc raised an exception */
1997-04-29 15:18:01 -03:00
PyTraceBack_Here(f);
Py_XDECREF(*p_trace);
*p_trace = NULL;
if (p_newtrace) {
1997-04-29 15:18:01 -03:00
Py_XDECREF(*p_newtrace);
*p_newtrace = NULL;
}
/* to be extra double plus sure we don't get recursive
* calls inf either tracefunc or profilefunc gets an
* exception, zap the global variables.
*/
Py_XDECREF(tstate->sys_tracefunc);
tstate->sys_tracefunc = NULL;
Py_XDECREF(tstate->sys_profilefunc);
tstate->sys_profilefunc = NULL;
return -1;
}
else {
if (p_newtrace) {
1997-04-29 15:18:01 -03:00
Py_XDECREF(*p_newtrace);
if (res == Py_None)
*p_newtrace = NULL;
else {
1997-04-29 15:18:01 -03:00
Py_INCREF(res);
*p_newtrace = res;
}
}
1997-04-29 15:18:01 -03:00
Py_DECREF(res);
return 0;
}
1992-01-11 22:29:51 -04:00
}
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_GetBuiltins(void)
{
PyThreadState *tstate = PyThreadState_Get();
PyFrameObject *current_frame = tstate->frame;
if (current_frame == NULL)
return tstate->interp->builtins;
else
return current_frame->f_builtins;
}
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_GetLocals(void)
{
PyFrameObject *current_frame = PyThreadState_Get()->frame;
if (current_frame == NULL)
return NULL;
1997-04-29 15:18:01 -03:00
PyFrame_FastToLocals(current_frame);
return current_frame->f_locals;
}
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_GetGlobals(void)
{
PyFrameObject *current_frame = PyThreadState_Get()->frame;
if (current_frame == NULL)
return NULL;
else
return current_frame->f_globals;
}
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_GetFrame(void)
{
PyFrameObject *current_frame = PyThreadState_Get()->frame;
1997-04-29 15:18:01 -03:00
return (PyObject *)current_frame;
}
int
PyEval_GetRestricted(void)
{
PyFrameObject *current_frame = PyThreadState_Get()->frame;
return current_frame == NULL ? 0 : current_frame->f_restricted;
}
int
Py_FlushLine(void)
{
1997-04-29 15:18:01 -03:00
PyObject *f = PySys_GetObject("stdout");
if (f == NULL)
return 0;
if (!PyFile_SoftSpace(f, 0))
return 0;
return PyFile_WriteString("\n", f);
}
1995-07-18 11:51:37 -03:00
/* External interface to call any callable object.
The arg must be a tuple or NULL. */
#undef PyEval_CallObject
/* for backward compatibility: export this interface */
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_CallObject(PyObject *func, PyObject *arg)
{
1997-04-29 15:18:01 -03:00
return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
1995-07-18 11:51:37 -03:00
}
#define PyEval_CallObject(func,arg) \
PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
1995-07-18 11:51:37 -03:00
1997-04-29 15:18:01 -03:00
PyObject *
PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw)
1995-07-18 11:51:37 -03:00
{
PyObject *result;
1995-07-18 11:51:37 -03:00
if (arg == NULL)
1997-04-29 15:18:01 -03:00
arg = PyTuple_New(0);
else if (!PyTuple_Check(arg)) {
PyErr_SetString(PyExc_TypeError,
"argument list must be a tuple");
1995-07-18 11:51:37 -03:00
return NULL;
}
else
1997-04-29 15:18:01 -03:00
Py_INCREF(arg);
1995-07-18 11:51:37 -03:00
1997-04-29 15:18:01 -03:00
if (kw != NULL && !PyDict_Check(kw)) {
PyErr_SetString(PyExc_TypeError,
"keyword list must be a dictionary");
Py_DECREF(arg);
1995-08-04 01:14:47 -03:00
return NULL;
}
result = call_object(func, arg, kw);
1997-04-29 15:18:01 -03:00
Py_DECREF(arg);
return result;
}
/* How often is each kind of object called? The answer depends on the
program. An instrumented call_object() was used to run the Python
regression test suite. The results were:
4200000 PyCFunctions
390000 fast_function() calls
94000 other functions
480000 all functions (sum of prev two)
150000 methods
100000 classes
Tests on other bodies of code show that PyCFunctions are still
most common, but not by such a large margin.
*/
static PyObject *
call_object(PyObject *func, PyObject *arg, PyObject *kw)
{
ternaryfunc call;
PyObject *result;
if (PyMethod_Check(func))
result = call_method(func, arg, kw);
else if (PyFunction_Check(func))
result = call_eval_code2(func, arg, kw);
else if (PyCFunction_Check(func))
result = call_cfunction(func, arg, kw);
else if (PyClass_Check(func))
result = PyInstance_New(func, arg, kw);
else if (PyInstance_Check(func))
result = call_instance(func, arg, kw);
else if ((call = func->ob_type->tp_call) != NULL)
result = (*call)(func, arg, kw);
else {
PyErr_Format(PyExc_TypeError, "object is not callable: %s",
PyString_AS_STRING(PyObject_Repr(func)));
return NULL;
}
1997-04-29 15:18:01 -03:00
if (result == NULL && !PyErr_Occurred())
PyErr_SetString(PyExc_SystemError,
1995-07-18 11:51:37 -03:00
"NULL result without error in call_object");
return result;
}
1997-04-29 15:18:01 -03:00
static PyObject *
call_cfunction(PyObject *func, PyObject *arg, PyObject *kw)
{
PyCFunctionObject* f = (PyCFunctionObject*)func;
PyCFunction meth = PyCFunction_GET_FUNCTION(func);
PyObject *self = PyCFunction_GET_SELF(func);
int flags = PyCFunction_GET_FLAGS(func);
if (flags & METH_KEYWORDS) {
return (*(PyCFunctionWithKeywords)meth)(self, arg, kw);
}
if (kw != NULL && PyDict_Size(kw) != 0) {
PyErr_Format(PyExc_TypeError,
"%.200s() takes no keyword arguments",
f->m_ml->ml_name);
return NULL;
}
if (flags & METH_VARARGS) {
return (*meth)(self, arg);
}
if (!(flags & METH_VARARGS)) {
/* the really old style */
int size = PyTuple_GET_SIZE(arg);
if (size == 1)
arg = PyTuple_GET_ITEM(arg, 0);
else if (size == 0)
arg = NULL;
return (*meth)(self, arg);
}
/* should never get here ??? */
PyErr_BadInternalCall();
return NULL;
}
1997-04-29 15:18:01 -03:00
static PyObject *
call_instance(PyObject *func, PyObject *arg, PyObject *kw)
{
PyObject *res, *call = PyObject_GetAttrString(func, "__call__");
if (call == NULL) {
PyInstanceObject *inst = (PyInstanceObject*) func;
PyErr_Clear();
PyErr_Format(PyExc_AttributeError,
"%.200s instance has no __call__ method",
PyString_AsString(inst->in_class->cl_name));
1995-07-18 11:51:37 -03:00
return NULL;
}
res = call_object(call, arg, kw);
Py_DECREF(call);
return res;
}
static PyObject *
call_method(PyObject *func, PyObject *arg, PyObject *kw)
{
PyObject *self = PyMethod_GET_SELF(func);
PyObject *class = PyMethod_GET_CLASS(func);
PyObject *result;
func = PyMethod_GET_FUNCTION(func);
if (self == NULL) {
/* Unbound methods must be called with an instance of
the class (or a derived class) as first argument */
if (PyTuple_Size(arg) >= 1)
self = PyTuple_GET_ITEM(arg, 0);
if (!(self != NULL && PyInstance_Check(self)
&& PyClass_IsSubclass((PyObject *)
(((PyInstanceObject *)self)->in_class),
class))) {
PyObject* fn = ((PyFunctionObject*) func)->func_name;
PyErr_Format(PyExc_TypeError,
"unbound method %s%smust be "
"called with instance as first argument",
fn ? PyString_AsString(fn) : "",
fn ? "() " : "");
return NULL;
}
1997-04-29 15:18:01 -03:00
Py_INCREF(arg);
} else {
int argcount = PyTuple_Size(arg);
PyObject *newarg = PyTuple_New(argcount + 1);
int i;
if (newarg == NULL)
return NULL;
Py_INCREF(self);
PyTuple_SET_ITEM(newarg, 0, self);
for (i = 0; i < argcount; i++) {
PyObject *v = PyTuple_GET_ITEM(arg, i);
Py_XINCREF(v);
PyTuple_SET_ITEM(newarg, i+1, v);
}
arg = newarg;
}
result = call_object(func, arg, kw);
Py_DECREF(arg);
return result;
}
static PyObject *
call_eval_code2(PyObject *func, PyObject *arg, PyObject *kw)
{
PyObject *result;
PyObject *argdefs;
PyObject **d, **k;
int nk, nd;
argdefs = PyFunction_GET_DEFAULTS(func);
1997-04-29 15:18:01 -03:00
if (argdefs != NULL && PyTuple_Check(argdefs)) {
d = &PyTuple_GET_ITEM((PyTupleObject *)argdefs, 0);
nd = PyTuple_Size(argdefs);
}
1995-07-18 11:51:37 -03:00
else {
d = NULL;
nd = 0;
}
1995-07-18 11:51:37 -03:00
if (kw != NULL) {
int pos, i;
1997-04-29 15:18:01 -03:00
nk = PyDict_Size(kw);
k = PyMem_NEW(PyObject *, 2*nk);
1995-07-18 11:51:37 -03:00
if (k == NULL) {
1997-04-29 15:18:01 -03:00
PyErr_NoMemory();
Py_DECREF(arg);
1995-07-18 11:51:37 -03:00
return NULL;
}
pos = i = 0;
1997-04-29 15:18:01 -03:00
while (PyDict_Next(kw, &pos, &k[i], &k[i+1]))
1995-07-18 11:51:37 -03:00
i += 2;
nk = i/2;
/* XXX This is broken if the caller deletes dict items! */
}
else {
k = NULL;
nk = 0;
}
1995-07-18 11:51:37 -03:00
result = eval_code2(
(PyCodeObject *)PyFunction_GET_CODE(func),
PyFunction_GET_GLOBALS(func), (PyObject *)NULL,
1997-04-29 15:18:01 -03:00
&PyTuple_GET_ITEM(arg, 0), PyTuple_Size(arg),
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
k, nk, d, nd,
PyFunction_GET_CLOSURE(func));
if (k != NULL)
PyMem_DEL(k);
1995-07-18 11:51:37 -03:00
return result;
}
#define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
/* The two fast_xxx() functions optimize calls for which no argument
tuple is necessary; the objects are passed directly from the stack.
fast_cfunction() is called for METH_OLDARGS functions.
fast_function() is for functions with no special argument handling.
*/
static PyObject *
fast_cfunction(PyObject *func, PyObject ***pp_stack, int na)
{
PyCFunction meth = PyCFunction_GET_FUNCTION(func);
PyObject *self = PyCFunction_GET_SELF(func);
if (na == 0)
return (*meth)(self, NULL);
else if (na == 1) {
PyObject *arg = EXT_POP(*pp_stack);
PyObject *result = (*meth)(self, arg);
Py_DECREF(arg);
return result;
} else {
PyObject *args = load_args(pp_stack, na);
PyObject *result = (*meth)(self, args);
Py_DECREF(args);
return result;
}
}
static PyObject *
fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
{
PyObject *co = PyFunction_GET_CODE(func);
PyObject *globals = PyFunction_GET_GLOBALS(func);
PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
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
PyObject *closure = PyFunction_GET_CLOSURE(func);
PyObject **d = NULL;
int nd = 0;
if (argdefs != NULL) {
d = &PyTuple_GET_ITEM(argdefs, 0);
nd = ((PyTupleObject *)argdefs)->ob_size;
}
return eval_code2((PyCodeObject *)co, globals,
(PyObject *)NULL, (*pp_stack)-n, na,
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
(*pp_stack)-2*nk, nk, d, nd,
closure);
}
static PyObject *
update_keyword_args(PyObject *orig_kwdict, int nk, PyObject ***pp_stack,
PyObject *func)
{
PyObject *kwdict = NULL;
if (orig_kwdict == NULL)
kwdict = PyDict_New();
else {
kwdict = PyDict_Copy(orig_kwdict);
Py_DECREF(orig_kwdict);
}
if (kwdict == NULL)
return NULL;
while (--nk >= 0) {
int err;
PyObject *value = EXT_POP(*pp_stack);
PyObject *key = EXT_POP(*pp_stack);
if (PyDict_GetItem(kwdict, key) != NULL) {
PyObject* fn = ((PyFunctionObject*) func)->func_name;
PyErr_Format(PyExc_TypeError,
"%.200s%s got multiple values "
"for keyword argument '%.400s'",
fn ? PyString_AsString(fn) : "function",
fn ? "()" : "", PyString_AsString(key));
Py_DECREF(key);
Py_DECREF(value);
Py_DECREF(kwdict);
return NULL;
}
err = PyDict_SetItem(kwdict, key, value);
Py_DECREF(key);
Py_DECREF(value);
if (err) {
Py_DECREF(kwdict);
return NULL;
}
}
return kwdict;
}
static PyObject *
update_star_args(int nstack, int nstar, PyObject *stararg,
PyObject ***pp_stack)
{
PyObject *callargs, *w;
callargs = PyTuple_New(nstack + nstar);
if (callargs == NULL) {
return NULL;
}
if (nstar) {
int i;
for (i = 0; i < nstar; i++) {
PyObject *a = PyTuple_GET_ITEM(stararg, i);
Py_INCREF(a);
PyTuple_SET_ITEM(callargs, nstack + i, a);
}
}
while (--nstack >= 0) {
w = EXT_POP(*pp_stack);
PyTuple_SET_ITEM(callargs, nstack, w);
}
return callargs;
}
static PyObject *
load_args(PyObject ***pp_stack, int na)
{
PyObject *args = PyTuple_New(na);
PyObject *w;
if (args == NULL)
return NULL;
while (--na >= 0) {
w = EXT_POP(*pp_stack);
PyTuple_SET_ITEM(args, na, w);
}
return args;
}
static PyObject *
do_call(PyObject *func, PyObject ***pp_stack, int na, int nk)
{
PyObject *callargs = NULL;
PyObject *kwdict = NULL;
PyObject *result = NULL;
if (nk > 0) {
kwdict = update_keyword_args(NULL, nk, pp_stack, func);
if (kwdict == NULL)
goto call_fail;
}
callargs = load_args(pp_stack, na);
if (callargs == NULL)
goto call_fail;
result = call_object(func, callargs, kwdict);
call_fail:
Py_XDECREF(callargs);
Py_XDECREF(kwdict);
return result;
}
static PyObject *
ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk)
{
int nstar = 0;
PyObject *callargs = NULL;
PyObject *stararg = NULL;
PyObject *kwdict = NULL;
PyObject *result = NULL;
if (flags & CALL_FLAG_KW) {
kwdict = EXT_POP(*pp_stack);
if (!(kwdict && PyDict_Check(kwdict))) {
PyObject* fn = ((PyFunctionObject*) func)->func_name;
PyErr_Format(PyExc_TypeError,
"%s%s argument after ** must be a dictionary",
fn ? PyString_AsString(fn) : "function",
fn ? "()" : "");
goto ext_call_fail;
}
}
if (flags & CALL_FLAG_VAR) {
stararg = EXT_POP(*pp_stack);
if (!PyTuple_Check(stararg)) {
PyObject *t = NULL;
t = PySequence_Tuple(stararg);
if (t == NULL) {
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
PyObject* fn =
((PyFunctionObject*) func)->func_name;
PyErr_Format(PyExc_TypeError,
"%s%s argument after * must be a sequence",
fn ? PyString_AsString(fn) : "function",
fn ? "()" : "");
}
goto ext_call_fail;
}
Py_DECREF(stararg);
stararg = t;
}
nstar = PyTuple_GET_SIZE(stararg);
}
if (nk > 0) {
kwdict = update_keyword_args(kwdict, nk, pp_stack, func);
if (kwdict == NULL)
goto ext_call_fail;
}
callargs = update_star_args(na, nstar, stararg, pp_stack);
if (callargs == NULL)
goto ext_call_fail;
result = call_object(func, callargs, kwdict);
ext_call_fail:
Py_XDECREF(callargs);
Py_XDECREF(kwdict);
Py_XDECREF(stararg);
return result;
}
#define SLICE_ERROR_MSG \
"standard sequence type does not support step size other than one"
1997-04-29 15:18:01 -03:00
static PyObject *
loop_subscript(PyObject *v, PyObject *w)
{
1997-04-29 15:18:01 -03:00
PySequenceMethods *sq = v->ob_type->tp_as_sequence;
int i;
if (sq == NULL || sq->sq_item == NULL) {
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_TypeError, "loop over non-sequence");
return NULL;
}
1997-04-29 15:18:01 -03:00
i = PyInt_AsLong(w);
v = (*sq->sq_item)(v, i);
if (v)
return v;
if (PyErr_ExceptionMatches(PyExc_IndexError))
1997-04-29 15:18:01 -03:00
PyErr_Clear();
return NULL;
}
/* Extract a slice index from a PyInt or PyLong, the index is bound to
the range [-INT_MAX+1, INTMAX]. Returns 0 and an exception if there is
and error. Returns 1 on success.*/
int
_PyEval_SliceIndex(PyObject *v, int *pi)
{
if (v != NULL) {
long x;
if (PyInt_Check(v)) {
x = PyInt_AsLong(v);
} else if (PyLong_Check(v)) {
x = PyLong_AsLong(v);
if (x==-1 && PyErr_Occurred()) {
PyObject *long_zero;
int cmp;
if (!PyErr_ExceptionMatches(
PyExc_OverflowError)) {
/* It's not an overflow error, so just
signal an error */
return 0;
}
/* Clear the OverflowError */
PyErr_Clear();
/* It's an overflow error, so we need to
check the sign of the long integer,
set the value to INT_MAX or 0, and clear
the error. */
/* Create a long integer with a value of 0 */
long_zero = PyLong_FromLong(0L);
if (long_zero == NULL) return 0;
/* Check sign */
cmp = PyObject_RichCompareBool(v, long_zero,
Py_GT);
Py_DECREF(long_zero);
if (cmp < 0)
return 0;
else if (cmp > 0)
x = INT_MAX;
else
x = 0;
}
} else {
PyErr_SetString(PyExc_TypeError,
"slice indices must be integers");
return 0;
}
/* Truncate -- very long indices are truncated anyway */
if (x > INT_MAX)
x = INT_MAX;
else if (x < -INT_MAX)
x = 0;
*pi = x;
}
return 1;
}
1997-04-29 15:18:01 -03:00
static PyObject *
apply_slice(PyObject *u, PyObject *v, PyObject *w) /* return u[v:w] */
{
int ilow = 0, ihigh = INT_MAX;
if (!_PyEval_SliceIndex(v, &ilow))
return NULL;
if (!_PyEval_SliceIndex(w, &ihigh))
return NULL;
return PySequence_GetSlice(u, ilow, ihigh);
}
static int
assign_slice(PyObject *u, PyObject *v, PyObject *w, PyObject *x)
/* u[v:w] = x */
{
int ilow = 0, ihigh = INT_MAX;
if (!_PyEval_SliceIndex(v, &ilow))
return -1;
if (!_PyEval_SliceIndex(w, &ihigh))
return -1;
if (x == NULL)
return PySequence_DelSlice(u, ilow, ihigh);
else
return PySequence_SetSlice(u, ilow, ihigh, x);
}
1997-04-29 15:18:01 -03:00
static PyObject *
cmp_outcome(int op, register PyObject *v, register PyObject *w)
{
int res = 0;
switch (op) {
case IS:
case IS_NOT:
res = (v == w);
if (op == (int) IS_NOT)
res = !res;
break;
case IN:
case NOT_IN:
res = PySequence_Contains(w, v);
if (res < 0)
return NULL;
if (op == (int) NOT_IN)
res = !res;
break;
case EXC_MATCH:
res = PyErr_GivenExceptionMatches(v, w);
break;
default:
return PyObject_RichCompare(v, w, op);
}
1997-04-29 15:18:01 -03:00
v = res ? Py_True : Py_False;
Py_INCREF(v);
return v;
}
1990-12-20 11:06:42 -04:00
static PyObject *
import_from(PyObject *v, PyObject *name)
{
PyObject *x;
x = PyObject_GetAttr(v, name);
if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Format(PyExc_ImportError,
"cannot import name %.230s",
PyString_AsString(name));
}
return x;
}
static int
import_all_from(PyObject *locals, PyObject *v)
{
PyObject *all = PyObject_GetAttrString(v, "__all__");
PyObject *dict, *name, *value;
int skip_leading_underscores = 0;
int pos, err;
if (all == NULL) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
return -1; /* Unexpected error */
PyErr_Clear();
dict = PyObject_GetAttrString(v, "__dict__");
if (dict == NULL) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
return -1;
PyErr_SetString(PyExc_ImportError,
"from-import-* object has no __dict__ and no __all__");
return -1;
}
all = PyMapping_Keys(dict);
Py_DECREF(dict);
if (all == NULL)
return -1;
skip_leading_underscores = 1;
}
for (pos = 0, err = 0; ; pos++) {
name = PySequence_GetItem(all, pos);
if (name == NULL) {
if (!PyErr_ExceptionMatches(PyExc_IndexError))
err = -1;
else
PyErr_Clear();
break;
}
if (skip_leading_underscores &&
PyString_Check(name) &&
PyString_AS_STRING(name)[0] == '_')
{
Py_DECREF(name);
continue;
}
value = PyObject_GetAttr(v, name);
if (value == NULL)
err = -1;
else
err = PyDict_SetItem(locals, name, value);
Py_DECREF(name);
Py_XDECREF(value);
if (err != 0)
break;
}
Py_DECREF(all);
return err;
}
1990-12-20 11:06:42 -04:00
1997-04-29 15:18:01 -03:00
static PyObject *
build_class(PyObject *methods, PyObject *bases, PyObject *name)
{
int i, n;
1997-04-29 15:18:01 -03:00
if (!PyTuple_Check(bases)) {
PyErr_SetString(PyExc_SystemError,
"build_class with non-tuple bases");
return NULL;
}
1997-04-29 15:18:01 -03:00
if (!PyDict_Check(methods)) {
PyErr_SetString(PyExc_SystemError,
"build_class with non-dictionary");
return NULL;
}
1997-04-29 15:18:01 -03:00
if (!PyString_Check(name)) {
PyErr_SetString(PyExc_SystemError,
"build_class with non-string name");
return NULL;
}
n = PyTuple_Size(bases);
for (i = 0; i < n; i++) {
1997-04-29 15:18:01 -03:00
PyObject *base = PyTuple_GET_ITEM(bases, i);
if (!PyClass_Check(base)) {
/* Call the base's *type*, if it is callable.
This code is a hook for Donald Beaudry's
and Jim Fulton's type extensions. In
unextended Python it will never be triggered
since its types are not callable.
Ditto: call the bases's *class*, if it has
one. This makes the same thing possible
without writing C code. A true meta-object
protocol! */
PyObject *basetype = (PyObject *)base->ob_type;
PyObject *callable = NULL;
if (PyCallable_Check(basetype))
callable = basetype;
else
callable = PyObject_GetAttrString(
base, "__class__");
if (callable) {
PyObject *args;
PyObject *newclass = NULL;
args = Py_BuildValue(
"(OOO)", name, bases, methods);
if (args != NULL) {
newclass = PyEval_CallObject(
callable, args);
Py_DECREF(args);
}
1998-04-10 19:27:42 -03:00
if (callable != basetype) {
Py_DECREF(callable);
1998-04-10 19:27:42 -03:00
}
return newclass;
}
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_TypeError,
"base is not a class object");
return NULL;
}
1990-11-18 13:27:39 -04:00
}
1997-04-29 15:18:01 -03:00
return PyClass_New(bases, methods, name);
}
static int
exec_statement(PyFrameObject *f, PyObject *prog, PyObject *globals,
PyObject *locals)
{
int n;
1997-04-29 15:18:01 -03:00
PyObject *v;
1995-07-18 11:51:37 -03:00
int plain = 0;
1997-04-29 15:18:01 -03:00
if (PyTuple_Check(prog) && globals == Py_None && locals == Py_None &&
((n = PyTuple_Size(prog)) == 2 || n == 3)) {
/* Backward compatibility hack */
1997-04-29 15:18:01 -03:00
globals = PyTuple_GetItem(prog, 1);
if (n == 3)
1997-04-29 15:18:01 -03:00
locals = PyTuple_GetItem(prog, 2);
prog = PyTuple_GetItem(prog, 0);
}
1997-04-29 15:18:01 -03:00
if (globals == Py_None) {
globals = PyEval_GetGlobals();
if (locals == Py_None) {
locals = PyEval_GetLocals();
1995-07-18 11:51:37 -03:00
plain = 1;
}
}
1997-04-29 15:18:01 -03:00
else if (locals == Py_None)
locals = globals;
1997-04-29 15:18:01 -03:00
if (!PyString_Check(prog) &&
!PyUnicode_Check(prog) &&
1997-04-29 15:18:01 -03:00
!PyCode_Check(prog) &&
!PyFile_Check(prog)) {
PyErr_SetString(PyExc_TypeError,
"exec: arg 1 must be a string, file, or code object");
return -1;
}
if (!PyDict_Check(globals)) {
PyErr_SetString(PyExc_TypeError,
"exec: arg 2 must be a dictionary or None");
return -1;
}
if (!PyDict_Check(locals)) {
1997-04-29 15:18:01 -03:00
PyErr_SetString(PyExc_TypeError,
"exec: arg 3 must be a dictionary or None");
return -1;
}
1997-04-29 15:18:01 -03:00
if (PyDict_GetItemString(globals, "__builtins__") == NULL)
PyDict_SetItemString(globals, "__builtins__", f->f_builtins);
1997-04-29 15:18:01 -03:00
if (PyCode_Check(prog)) {
v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals);
}
else if (PyFile_Check(prog)) {
1997-04-29 15:18:01 -03:00
FILE *fp = PyFile_AsFile(prog);
char *name = PyString_AsString(PyFile_Name(prog));
v = PyRun_File(fp, name, Py_file_input, globals, locals);
}
else {
char *str;
if (PyString_AsStringAndSize(prog, &str, NULL))
return -1;
v = PyRun_String(str, Py_file_input, globals, locals);
}
if (plain)
PyFrame_LocalsToFast(f, 0);
1995-07-18 11:51:37 -03:00
if (v == NULL)
return -1;
1997-04-29 15:18:01 -03:00
Py_DECREF(v);
return 0;
}
static void
format_exc_check_arg(PyObject *exc, char *format_str, PyObject *obj)
{
char *obj_str;
if (!obj)
return;
obj_str = PyString_AsString(obj);
if (!obj_str)
return;
PyErr_Format(exc, format_str, obj_str);
}
#ifdef DYNAMIC_EXECUTION_PROFILE
PyObject *
getarray(long a[256])
{
int i;
PyObject *l = PyList_New(256);
if (l == NULL) return NULL;
for (i = 0; i < 256; i++) {
PyObject *x = PyInt_FromLong(a[i]);
if (x == NULL) {
Py_DECREF(l);
return NULL;
}
PyList_SetItem(l, i, x);
}
for (i = 0; i < 256; i++)
a[i] = 0;
return l;
}
PyObject *
_Py_GetDXProfile(PyObject *self, PyObject *args)
{
#ifndef DXPAIRS
return getarray(dxp);
#else
int i;
PyObject *l = PyList_New(257);
if (l == NULL) return NULL;
for (i = 0; i < 257; i++) {
PyObject *x = getarray(dxpairs[i]);
if (x == NULL) {
Py_DECREF(l);
return NULL;
}
PyList_SetItem(l, i, x);
}
return l;
#endif
}
#endif