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"
|
1992-08-05 16:58:53 -03:00
|
|
|
#include "eval.h"
|
1990-11-18 13:27:39 -04:00
|
|
|
#include "opcode.h"
|
|
|
|
|
2000-07-11 18:59:16 -03:00
|
|
|
#ifdef macintosh
|
|
|
|
#include "macglue.h"
|
|
|
|
#endif
|
|
|
|
|
1993-11-05 06:22:19 -04:00
|
|
|
#include <ctype.h>
|
|
|
|
|
1992-08-12 12:35:34 -03:00
|
|
|
/* Turn this on if your compiler chokes on the big switch: */
|
1995-01-02 15:04:15 -04:00
|
|
|
/* #define CASE_TOO_BIG 1 */
|
1992-08-12 12:35:34 -03:00
|
|
|
|
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
|
|
|
|
|
2001-01-03 19:52:36 -04:00
|
|
|
typedef PyObject *(*callproc)(PyObject *, PyObject *, PyObject *);
|
1993-03-30 13:46:03 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Forward declarations */
|
1992-03-27 13:29:15 -04:00
|
|
|
|
2000-07-09 00:09:57 -03:00
|
|
|
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 *);
|
2001-01-03 19:52:36 -04:00
|
|
|
|
2001-04-11 10:52:29 -03:00
|
|
|
static char *get_func_name(PyObject *);
|
|
|
|
static char *get_func_desc(PyObject *);
|
2001-01-03 19:52:36 -04:00
|
|
|
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);
|
2001-01-17 11:42:30 -04:00
|
|
|
static PyObject *update_keyword_args(PyObject *, int, PyObject ***,PyObject *);
|
2001-01-15 18:14:16 -04:00
|
|
|
static PyObject *update_star_args(int, int, PyObject *, PyObject ***);
|
2001-01-03 19:52:36 -04:00
|
|
|
static PyObject *load_args(PyObject ***, int);
|
|
|
|
#define CALL_FLAG_VAR 1
|
|
|
|
#define CALL_FLAG_KW 2
|
|
|
|
|
1992-03-27 13:29:15 -04:00
|
|
|
#ifdef LLTRACE
|
2000-07-09 00:09:57 -03:00
|
|
|
static int prtrace(PyObject *, char *);
|
1992-03-27 13:29:15 -04:00
|
|
|
#endif
|
2000-07-09 00:09:57 -03:00
|
|
|
static void call_exc_trace(PyObject **, PyObject**, PyFrameObject *);
|
|
|
|
static int call_trace(PyObject **, PyObject **,
|
2001-06-16 18:02:31 -03:00
|
|
|
PyFrameObject *, PyObject *, PyObject *);
|
2000-07-09 00:09:57 -03:00
|
|
|
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 *);
|
2000-08-17 19:55:00 -03:00
|
|
|
static PyObject *import_from(PyObject *, PyObject *);
|
|
|
|
static int import_all_from(PyObject *, PyObject *);
|
2000-07-09 00:09:57 -03:00
|
|
|
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 *);
|
2000-08-30 17:25:01 -03:00
|
|
|
static void format_exc_check_arg(PyObject *, char *, PyObject *);
|
1992-03-27 13:29:15 -04:00
|
|
|
|
2000-08-30 17:25:01 -03:00
|
|
|
#define NAME_ERROR_MSG \
|
2000-10-24 16:57:45 -03:00
|
|
|
"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"
|
2000-08-30 17:25:01 -03:00
|
|
|
#define UNBOUNDLOCAL_ERROR_MSG \
|
2000-10-24 16:57:45 -03:00
|
|
|
"local variable '%.200s' referenced before assignment"
|
2001-04-13 13:51:46 -03:00
|
|
|
#define UNBOUNDFREE_ERROR_MSG \
|
|
|
|
"free variable '%.200s' referenced before assignment" \
|
|
|
|
" in enclosing scope"
|
1990-11-18 13:27:39 -04:00
|
|
|
|
1997-01-24 09:49:28 -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
|
|
|
|
|
2001-06-08 01:33:09 -03:00
|
|
|
/* Cached interned string objects used for calling the profile and
|
|
|
|
* trace functions.
|
|
|
|
*/
|
|
|
|
static PyObject *str_call = NULL;
|
|
|
|
static PyObject *str_exception = NULL;
|
|
|
|
static PyObject *str_line = NULL;
|
|
|
|
static PyObject *str_return = NULL;
|
|
|
|
|
|
|
|
|
1994-08-30 05:01:59 -03:00
|
|
|
#ifdef WITH_THREAD
|
1992-08-05 16:58:53 -03:00
|
|
|
|
1999-04-07 13:07:23 -03:00
|
|
|
#ifndef DONT_HAVE_ERRNO_H
|
1992-08-04 09:41:02 -03:00
|
|
|
#include <errno.h>
|
1999-04-07 13:07:23 -03:00
|
|
|
#endif
|
1998-10-01 17:42:43 -03:00
|
|
|
#include "pythread.h"
|
1992-08-05 16:58:53 -03:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
extern int _PyThread_Started; /* Flag for Py_Exit */
|
|
|
|
|
1998-12-21 15:32:43 -04:00
|
|
|
static PyThread_type_lock interpreter_lock = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
static long main_thread = 0;
|
1992-08-04 09:41:02 -03:00
|
|
|
|
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_InitThreads(void)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
|
|
|
if (interpreter_lock)
|
1993-01-06 09:36:38 -04:00
|
|
|
return;
|
1997-05-05 17:56:21 -03:00
|
|
|
_PyThread_Started = 1;
|
1998-12-21 15:32:43 -04:00
|
|
|
interpreter_lock = PyThread_allocate_lock();
|
|
|
|
PyThread_acquire_lock(interpreter_lock, 1);
|
|
|
|
main_thread = PyThread_get_thread_ident();
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
1992-08-05 16:58:53 -03:00
|
|
|
|
1997-08-02 00:10:38 -03:00
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_AcquireLock(void)
|
1997-08-02 00:10:38 -03:00
|
|
|
{
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_acquire_lock(interpreter_lock, 1);
|
1997-08-02 00:10:38 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_ReleaseLock(void)
|
1997-08-02 00:10:38 -03:00
|
|
|
{
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_release_lock(interpreter_lock);
|
1997-08-02 00:10:38 -03:00
|
|
|
}
|
|
|
|
|
1997-07-19 16:55:50 -03:00
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_AcquireThread(PyThreadState *tstate)
|
1997-07-19 16:55:50 -03:00
|
|
|
{
|
|
|
|
if (tstate == NULL)
|
|
|
|
Py_FatalError("PyEval_AcquireThread: NULL new thread state");
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_acquire_lock(interpreter_lock, 1);
|
1997-07-19 16:55:50 -03:00
|
|
|
if (PyThreadState_Swap(tstate) != NULL)
|
|
|
|
Py_FatalError(
|
|
|
|
"PyEval_AcquireThread: non-NULL old thread state");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_ReleaseThread(PyThreadState *tstate)
|
1997-07-19 16:55:50 -03:00
|
|
|
{
|
|
|
|
if (tstate == NULL)
|
|
|
|
Py_FatalError("PyEval_ReleaseThread: NULL thread state");
|
|
|
|
if (PyThreadState_Swap(NULL) != tstate)
|
|
|
|
Py_FatalError("PyEval_ReleaseThread: wrong thread state");
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_release_lock(interpreter_lock);
|
1997-07-19 16:55:50 -03:00
|
|
|
}
|
2000-08-27 14:34:07 -03:00
|
|
|
|
|
|
|
/* 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();
|
|
|
|
}
|
1992-08-04 09:41:02 -03:00
|
|
|
#endif
|
|
|
|
|
1992-08-05 16:58:53 -03:00
|
|
|
/* Functions save_thread and restore_thread are always defined so
|
|
|
|
dynamically loaded modules needn't be compiled separately for use
|
|
|
|
with and without threads: */
|
|
|
|
|
1997-07-18 20:56:58 -03:00
|
|
|
PyThreadState *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_SaveThread(void)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
1997-09-30 19:03:16 -03:00
|
|
|
PyThreadState *tstate = PyThreadState_Swap(NULL);
|
|
|
|
if (tstate == NULL)
|
|
|
|
Py_FatalError("PyEval_SaveThread: NULL tstate");
|
1994-08-30 05:01:59 -03:00
|
|
|
#ifdef WITH_THREAD
|
1997-09-30 19:03:16 -03:00
|
|
|
if (interpreter_lock)
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_release_lock(interpreter_lock);
|
1992-08-04 09:41:02 -03:00
|
|
|
#endif
|
1997-09-30 19:03:16 -03:00
|
|
|
return tstate;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_RestoreThread(PyThreadState *tstate)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
1997-09-30 19:03:16 -03:00
|
|
|
if (tstate == NULL)
|
|
|
|
Py_FatalError("PyEval_RestoreThread: NULL tstate");
|
1994-08-30 05:01:59 -03:00
|
|
|
#ifdef WITH_THREAD
|
1992-08-04 09:41:02 -03:00
|
|
|
if (interpreter_lock) {
|
1997-09-30 19:03:16 -03:00
|
|
|
int err = errno;
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_acquire_lock(interpreter_lock, 1);
|
1992-08-04 09:41:02 -03:00
|
|
|
errno = err;
|
|
|
|
}
|
|
|
|
#endif
|
1997-09-30 19:03:16 -03:00
|
|
|
PyThreadState_Swap(tstate);
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1994-09-14 10:31:22 -03:00
|
|
|
/* 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.
|
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
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
|
|
|
|
1994-09-14 10:31:22 -03:00
|
|
|
#define NPENDINGCALLS 32
|
|
|
|
static struct {
|
2000-07-25 09:56:38 -03:00
|
|
|
int (*func)(void *);
|
|
|
|
void *arg;
|
1994-09-14 10:31:22 -03:00
|
|
|
} pendingcalls[NPENDINGCALLS];
|
|
|
|
static volatile int pendingfirst = 0;
|
|
|
|
static volatile int pendinglast = 0;
|
1997-05-05 17:56:21 -03:00
|
|
|
static volatile int things_to_do = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
|
|
|
|
int
|
2000-07-25 09:56:38 -03:00
|
|
|
Py_AddPendingCall(int (*func)(void *), void *arg)
|
1994-09-14 10:31:22 -03:00
|
|
|
{
|
1994-09-29 06:45:57 -03:00
|
|
|
static int busy = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
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! */
|
1994-09-29 06:45:57 -03:00
|
|
|
if (busy)
|
|
|
|
return -1;
|
|
|
|
busy = 1;
|
1994-09-14 10:31:22 -03:00
|
|
|
i = pendinglast;
|
|
|
|
j = (i + 1) % NPENDINGCALLS;
|
|
|
|
if (j == pendingfirst)
|
|
|
|
return -1; /* Queue full */
|
|
|
|
pendingcalls[i].func = func;
|
|
|
|
pendingcalls[i].arg = arg;
|
|
|
|
pendinglast = j;
|
1997-05-05 17:56:21 -03:00
|
|
|
things_to_do = 1; /* Signal main loop */
|
1994-09-29 06:45:57 -03:00
|
|
|
busy = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
/* XXX End critical section */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1994-09-29 06:45:57 -03:00
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
Py_MakePendingCalls(void)
|
1994-09-14 10:31:22 -03:00
|
|
|
{
|
1994-09-29 06:45:57 -03:00
|
|
|
static int busy = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
#ifdef WITH_THREAD
|
1998-12-21 15:32:43 -04:00
|
|
|
if (main_thread && PyThread_get_thread_ident() != main_thread)
|
1994-09-14 10:31:22 -03:00
|
|
|
return 0;
|
|
|
|
#endif
|
1997-05-05 17:56:21 -03:00
|
|
|
if (busy)
|
1994-09-29 06:45:57 -03:00
|
|
|
return 0;
|
|
|
|
busy = 1;
|
1997-05-05 17:56:21 -03:00
|
|
|
things_to_do = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
for (;;) {
|
|
|
|
int i;
|
2000-07-25 09:56:38 -03:00
|
|
|
int (*func)(void *);
|
|
|
|
void *arg;
|
1994-09-14 10:31:22 -03:00
|
|
|
i = pendingfirst;
|
|
|
|
if (i == pendinglast)
|
|
|
|
break; /* Queue empty */
|
|
|
|
func = pendingcalls[i].func;
|
|
|
|
arg = pendingcalls[i].arg;
|
|
|
|
pendingfirst = (i + 1) % NPENDINGCALLS;
|
1994-09-29 06:45:57 -03:00
|
|
|
if (func(arg) < 0) {
|
|
|
|
busy = 0;
|
1997-05-05 17:56:21 -03:00
|
|
|
things_to_do = 1; /* We're not done yet */
|
1994-09-14 10:31:22 -03:00
|
|
|
return -1;
|
1994-09-29 06:45:57 -03:00
|
|
|
}
|
1994-09-14 10:31:22 -03:00
|
|
|
}
|
1994-09-29 06:45:57 -03:00
|
|
|
busy = 0;
|
1994-09-14 10:31:22 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-08-31 16:23:01 -03:00
|
|
|
/* The interpreter's recursion limit */
|
|
|
|
|
2000-08-31 22:52:08 -03:00
|
|
|
static int recursion_limit = 1000;
|
2000-08-31 16:23:01 -03:00
|
|
|
|
2000-09-01 08:07:19 -03:00
|
|
|
int
|
|
|
|
Py_GetRecursionLimit(void)
|
2000-08-31 16:23:01 -03:00
|
|
|
{
|
|
|
|
return recursion_limit;
|
|
|
|
}
|
|
|
|
|
2000-09-01 08:07:19 -03:00
|
|
|
void
|
|
|
|
Py_SetRecursionLimit(int new_limit)
|
2000-08-31 16:23:01 -03:00
|
|
|
{
|
|
|
|
recursion_limit = new_limit;
|
|
|
|
}
|
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* 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 */
|
2001-02-01 18:48:12 -04:00
|
|
|
WHY_BREAK, /* 'break' statement */
|
2001-02-16 07:52:31 -04:00
|
|
|
WHY_CONTINUE /* 'continue' statement */
|
1991-04-04 06:40:29 -04:00
|
|
|
};
|
1990-11-18 13:27:39 -04:00
|
|
|
|
2000-07-09 00:09:57 -03:00
|
|
|
static enum why_code do_raise(PyObject *, PyObject *, PyObject *);
|
|
|
|
static int unpack_sequence(PyObject *, int, PyObject **);
|
1997-01-21 01:34:20 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
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
|
|
|
{
|
1997-01-24 09:49:28 -04:00
|
|
|
#ifdef DXPAIRS
|
|
|
|
int lastopcode = 0;
|
|
|
|
#endif
|
2001-01-03 19:52:36 -04:00
|
|
|
PyObject **stack_pointer;
|
1991-04-04 06:40:29 -04:00
|
|
|
register unsigned char *next_instr;
|
2000-08-07 03:34:45 -03:00
|
|
|
register int opcode=0; /* Current opcode */
|
|
|
|
register int oparg=0; /* Current opcode argument, if any */
|
1991-04-04 06:40:29 -04:00
|
|
|
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;
|
2000-08-21 12:44:01 -03:00
|
|
|
register PyObject *stream = NULL; /* for PRINT opcodes */
|
1997-04-29 15:18:01 -03:00
|
|
|
register PyFrameObject *f; /* Current frame */
|
2001-01-29 18:51:52 -04:00
|
|
|
register PyObject **fastlocals, **freevars;
|
1998-11-23 17:09:51 -04:00
|
|
|
PyObject *retval = NULL; /* Return value */
|
1998-12-21 14:33:30 -04:00
|
|
|
PyThreadState *tstate = PyThreadState_GET();
|
1998-10-07 16:42:25 -03:00
|
|
|
unsigned char *first_instr;
|
1992-01-11 22:29:51 -04:00
|
|
|
#ifdef LLTRACE
|
1993-04-15 12:33:52 -03:00
|
|
|
int lltrace;
|
1991-04-04 06:40:29 -04:00
|
|
|
#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);
|
1992-09-03 17:29:45 -03:00
|
|
|
#endif
|
1990-11-18 13:27:39 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Code access macros */
|
1990-12-20 11:06:42 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
#define GETCONST(i) Getconst(f, i)
|
|
|
|
#define GETNAME(i) Getname(f, i)
|
|
|
|
#define GETNAMEV(i) Getnamev(f, i)
|
1998-10-07 16:42:25 -03:00
|
|
|
#define INSTR_OFFSET() (next_instr - first_instr)
|
1991-04-04 06:40:29 -04:00
|
|
|
#define NEXTOP() (*next_instr++)
|
|
|
|
#define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
|
1998-10-07 16:42:25 -03:00
|
|
|
#define JUMPTO(x) (next_instr = first_instr + (x))
|
1991-04-04 06:40:29 -04:00
|
|
|
#define JUMPBY(x) (next_instr += (x))
|
1990-12-20 11:06:42 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Stack manipulation macros */
|
1990-11-18 13:27:39 -04:00
|
|
|
|
1991-04-04 06:40:29 -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())
|
1991-04-04 06:40:29 -04:00
|
|
|
#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)
|
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
/* Start of code */
|
|
|
|
|
1996-07-30 13:49:37 -03:00
|
|
|
#ifdef USE_STACKCHECK
|
1997-05-05 17:56:21 -03:00
|
|
|
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");
|
1995-01-09 13:53:26 -04:00
|
|
|
return NULL;
|
1993-03-30 13:46:03 -04:00
|
|
|
}
|
|
|
|
|
1993-04-15 12:33:52 -03:00
|
|
|
#ifdef LLTRACE
|
1997-04-29 15:18:01 -03:00
|
|
|
lltrace = PyDict_GetItemString(globals, "__lltrace__") != NULL;
|
1993-04-15 12:33:52 -03:00
|
|
|
#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*/
|
1991-04-04 06:40:29 -04:00
|
|
|
co, /*code*/
|
2001-03-12 21:58:22 -04:00
|
|
|
globals, locals);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (f == NULL)
|
|
|
|
return NULL;
|
1995-07-18 11:51:37 -03:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
tstate->frame = f;
|
1997-01-27 19:42:36 -04:00
|
|
|
fastlocals = f->f_localsplus;
|
2001-01-29 18:51:52 -04:00
|
|
|
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;
|
1997-01-24 00:19:24 -04:00
|
|
|
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)) {
|
1997-11-19 12:05:40 -04:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-01-15 18:14:16 -04:00
|
|
|
"%.200s() takes %s %d "
|
|
|
|
"%sargument%s (%d given)",
|
2000-10-24 16:57:45 -03:00
|
|
|
PyString_AsString(co->co_name),
|
2001-01-15 18:14:16 -04:00
|
|
|
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);
|
1997-01-24 00:19:24 -04:00
|
|
|
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;
|
1999-10-25 21:12:20 -03:00
|
|
|
if (keyword == NULL || !PyString_Check(keyword)) {
|
2001-01-15 18:14:16 -04:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"%.200s() keywords must be strings",
|
|
|
|
PyString_AsString(co->co_name));
|
1999-10-25 21:12:20 -03:00
|
|
|
goto fail;
|
|
|
|
}
|
1995-07-18 11:51:37 -03:00
|
|
|
/* XXX slow -- speed up using dictionary? */
|
|
|
|
for (j = 0; j < co->co_argcount; j++) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyObject *nm = PyTuple_GET_ITEM(
|
|
|
|
co->co_varnames, j);
|
2001-01-17 11:42:30 -04:00
|
|
|
int cmp = PyObject_RichCompareBool(
|
|
|
|
keyword, nm, Py_EQ);
|
|
|
|
if (cmp > 0)
|
1995-07-18 11:51:37 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
else if (cmp < 0)
|
|
|
|
goto fail;
|
1995-07-18 11:51:37 -03:00
|
|
|
}
|
1997-05-22 21:06:51 -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,
|
2000-10-24 16:57:45 -03:00
|
|
|
"%.200s() got an unexpected "
|
|
|
|
"keyword argument '%.400s'",
|
|
|
|
PyString_AsString(co->co_name),
|
2000-03-28 19:49:17 -04:00
|
|
|
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) {
|
2001-01-17 11:42:30 -04:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-01-15 18:14:16 -04:00
|
|
|
"%.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) {
|
1997-11-19 12:05:40 -04:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-01-15 18:14:16 -04:00
|
|
|
"%.200s() takes %s %d "
|
|
|
|
"%sargument%s (%d given)",
|
2000-10-24 16:57:45 -03:00
|
|
|
PyString_AsString(co->co_name),
|
2001-01-15 18:14:16 -04:00
|
|
|
((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) {
|
2000-10-24 16:57:45 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-01-15 18:14:16 -04:00
|
|
|
"%.200s() takes no arguments (%d given)",
|
|
|
|
PyString_AsString(co->co_name),
|
|
|
|
argcount + kwcount);
|
1997-01-24 00:19:24 -04:00
|
|
|
goto fail;
|
1995-07-18 11:51:37 -03:00
|
|
|
}
|
|
|
|
}
|
2001-03-21 12:43:47 -04:00
|
|
|
/* Allocate and initialize storage for cell vars, and copy free
|
|
|
|
vars into frame. This isn't too efficient right now. */
|
2001-01-29 18:51:52 -04:00
|
|
|
if (f->f_ncells) {
|
2001-03-21 12:43:47 -04:00
|
|
|
int i = 0, j = 0, nargs, found;
|
|
|
|
char *cellname, *argname;
|
|
|
|
PyObject *c;
|
|
|
|
|
|
|
|
nargs = co->co_argcount;
|
|
|
|
if (co->co_flags & CO_VARARGS)
|
|
|
|
nargs++;
|
|
|
|
if (co->co_flags & CO_VARKEYWORDS)
|
|
|
|
nargs++;
|
|
|
|
|
|
|
|
/* Check for cells that shadow args */
|
|
|
|
for (i = 0; i < f->f_ncells && j < nargs; ++i) {
|
|
|
|
cellname = PyString_AS_STRING(
|
|
|
|
PyTuple_GET_ITEM(co->co_cellvars, i));
|
|
|
|
found = 0;
|
|
|
|
while (j < nargs) {
|
|
|
|
argname = PyString_AS_STRING(
|
|
|
|
PyTuple_GET_ITEM(co->co_varnames, j));
|
|
|
|
if (strcmp(cellname, argname) == 0) {
|
|
|
|
c = PyCell_New(GETLOCAL(j));
|
|
|
|
if (c == NULL)
|
|
|
|
goto fail;
|
|
|
|
GETLOCAL(f->f_nlocals + i) = c;
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
if (found == 0) {
|
|
|
|
c = PyCell_New(NULL);
|
|
|
|
if (c == NULL)
|
|
|
|
goto fail;
|
|
|
|
SETLOCAL(f->f_nlocals + i, c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Initialize any that are left */
|
|
|
|
while (i < f->f_ncells) {
|
|
|
|
c = PyCell_New(NULL);
|
|
|
|
if (c == NULL)
|
|
|
|
goto fail;
|
|
|
|
SETLOCAL(f->f_nlocals + i, c);
|
|
|
|
i++;
|
|
|
|
}
|
2001-01-29 18:51:52 -04:00
|
|
|
}
|
|
|
|
if (f->f_nfreevars) {
|
|
|
|
int i;
|
2001-03-12 21:58:22 -04:00
|
|
|
for (i = 0; i < f->f_nfreevars; ++i) {
|
|
|
|
PyObject *o = PyTuple_GET_ITEM(closure, i);
|
|
|
|
Py_INCREF(o);
|
|
|
|
freevars[f->f_ncells + i] = o;
|
|
|
|
}
|
2001-01-29 18:51:52 -04:00
|
|
|
}
|
1995-07-18 11:51:37 -03:00
|
|
|
|
1997-05-05 17:56:21 -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. */
|
1997-05-05 17:56:21 -03:00
|
|
|
if (call_trace(&tstate->sys_tracefunc,
|
2001-06-16 18:02:31 -03:00
|
|
|
&f->f_trace, f, str_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 */
|
1997-01-24 00:19:24 -04:00
|
|
|
goto fail;
|
1992-01-11 22:29:51 -04:00
|
|
|
}
|
1992-03-23 14:19:28 -04:00
|
|
|
}
|
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
if (tstate->sys_profilefunc != NULL) {
|
|
|
|
/* Similar for sys_profilefunc, except it needn't return
|
1992-03-23 14:19:28 -04:00
|
|
|
itself and isn't called for "line" events */
|
1997-05-05 17:56:21 -03:00
|
|
|
if (call_trace(&tstate->sys_profilefunc,
|
2001-06-16 18:02:31 -03:00
|
|
|
(PyObject**)0, f, str_call,
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_None/*XXX*/)) {
|
1997-01-24 00:19:24 -04:00
|
|
|
goto fail;
|
1992-01-11 22:29:51 -04:00
|
|
|
}
|
|
|
|
}
|
1994-08-30 05:01:59 -03:00
|
|
|
|
2000-08-31 16:23:01 -03:00
|
|
|
if (++tstate->recursion_depth > recursion_limit) {
|
1997-05-05 17:56:21 -03:00
|
|
|
--tstate->recursion_depth;
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
2000-10-24 16:57:45 -03:00
|
|
|
"maximum recursion depth exceeded");
|
1997-05-05 17:56:21 -03:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
1998-10-07 16:42:25 -03:00
|
|
|
_PyCode_GETCODEPTR(co, &first_instr);
|
|
|
|
next_instr = first_instr;
|
1991-04-04 06:40:29 -04:00
|
|
|
stack_pointer = f->f_valuestack;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
why = WHY_NOT;
|
|
|
|
err = 0;
|
1997-04-29 15:18:01 -03:00
|
|
|
x = Py_None; /* Not a reference, just anything non-NULL */
|
2000-10-11 10:54:07 -03:00
|
|
|
w = NULL;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
for (;;) {
|
1997-05-05 17:56:21 -03:00
|
|
|
/* 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. */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
if (things_to_do || --tstate->ticker < 0) {
|
1997-08-02 00:10:38 -03:00
|
|
|
tstate->ticker = tstate->interp->checkinterval;
|
1997-05-05 17:56:21 -03:00
|
|
|
if (things_to_do) {
|
1996-07-30 13:49:37 -03:00
|
|
|
if (Py_MakePendingCalls() < 0) {
|
|
|
|
why = WHY_EXCEPTION;
|
|
|
|
goto on_error;
|
|
|
|
}
|
|
|
|
}
|
1997-05-20 12:57:49 -03:00
|
|
|
#if !defined(HAVE_SIGNAL_H) || defined(macintosh)
|
1997-05-05 17:56:21 -03:00
|
|
|
/* 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()) {
|
1991-04-04 06:40:29 -04:00
|
|
|
why = WHY_EXCEPTION;
|
|
|
|
goto on_error;
|
|
|
|
}
|
1997-01-21 02:15:24 -04:00
|
|
|
#endif
|
1992-08-04 09:41:02 -03:00
|
|
|
|
1994-08-30 05:01:59 -03:00
|
|
|
#ifdef WITH_THREAD
|
1992-08-04 09:41:02 -03:00
|
|
|
if (interpreter_lock) {
|
|
|
|
/* Give another thread a chance */
|
|
|
|
|
1997-08-02 00:10:38 -03:00
|
|
|
if (PyThreadState_Swap(NULL) != tstate)
|
|
|
|
Py_FatalError("ceval: tstate mix-up");
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_release_lock(interpreter_lock);
|
1992-08-04 09:41:02 -03:00
|
|
|
|
|
|
|
/* Other threads may run now */
|
|
|
|
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_acquire_lock(interpreter_lock, 1);
|
1997-08-02 00:10:38 -03:00
|
|
|
if (PyThreadState_Swap(tstate) != NULL)
|
|
|
|
Py_FatalError("ceval: orphan tstate");
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
#endif
|
1990-11-18 13:27:39 -04:00
|
|
|
}
|
1992-08-04 09:41:02 -03:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Extract opcode and argument */
|
1992-09-03 17:29:45 -03:00
|
|
|
|
1996-12-30 12:17:54 -04:00
|
|
|
#if defined(Py_DEBUG) || defined(LLTRACE)
|
1992-09-03 17:29:45 -03:00
|
|
|
f->f_lasti = INSTR_OFFSET();
|
|
|
|
#endif
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
opcode = NEXTOP();
|
|
|
|
if (HAS_ARG(opcode))
|
|
|
|
oparg = NEXTARG();
|
2000-08-23 21:32:09 -03:00
|
|
|
dispatch_opcode:
|
1997-01-24 09:49:28 -04:00
|
|
|
#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
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Instruction tracing */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1992-01-11 22:29:51 -04:00
|
|
|
if (lltrace) {
|
1991-04-04 06:40:29 -04:00
|
|
|
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 */
|
2001-01-03 19:52:36 -04:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
switch (opcode) {
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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! */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* case STOP_CODE: this is an error! */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case POP_TOP:
|
|
|
|
v = POP();
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(v);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case ROT_TWO:
|
|
|
|
v = POP();
|
|
|
|
w = POP();
|
|
|
|
PUSH(v);
|
|
|
|
PUSH(w);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case ROT_THREE:
|
|
|
|
v = POP();
|
|
|
|
w = POP();
|
|
|
|
x = POP();
|
|
|
|
PUSH(v);
|
|
|
|
PUSH(x);
|
|
|
|
PUSH(w);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
case ROT_FOUR:
|
|
|
|
u = POP();
|
|
|
|
v = POP();
|
|
|
|
w = POP();
|
|
|
|
x = POP();
|
|
|
|
PUSH(u);
|
|
|
|
PUSH(x);
|
|
|
|
PUSH(w);
|
|
|
|
PUSH(v);
|
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
case DUP_TOPX:
|
|
|
|
switch (oparg) {
|
|
|
|
case 1:
|
2000-10-11 04:04:49 -03:00
|
|
|
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:
|
2000-08-24 17:11:32 -03:00
|
|
|
x = POP();
|
2000-10-11 04:04:49 -03:00
|
|
|
Py_INCREF(x);
|
2000-08-24 17:11:32 -03:00
|
|
|
w = POP();
|
2000-10-11 04:04:49 -03:00
|
|
|
Py_INCREF(w);
|
2000-08-24 17:11:32 -03:00
|
|
|
v = POP();
|
2000-10-11 04:04:49 -03:00
|
|
|
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);
|
2000-08-24 17:11:32 -03:00
|
|
|
u = POP();
|
2000-10-11 04:04:49 -03:00
|
|
|
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;
|
2000-08-24 17:11:32 -03:00
|
|
|
default:
|
2000-10-11 20:26:11 -03:00
|
|
|
Py_FatalError("invalid argument to DUP_TOPX"
|
|
|
|
" (bytecode corruption?)");
|
2000-08-24 17:11:32 -03:00
|
|
|
}
|
2000-10-11 04:04:49 -03:00
|
|
|
break;
|
2000-08-24 17:11:32 -03:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case UNARY_POSITIVE:
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case UNARY_NEGATIVE:
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case UNARY_NOT:
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
err = PyObject_IsTrue(v);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(v);
|
1997-05-06 12:06:49 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-10-24 11:59:31 -03:00
|
|
|
case UNARY_INVERT:
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1991-10-24 11:59:31 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1996-01-11 21:13:16 -04:00
|
|
|
case BINARY_POWER:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
x = PyNumber_Power(v, w, Py_None);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(w);
|
1996-01-11 21:13:16 -04:00
|
|
|
PUSH(x);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1996-01-11 21:13:16 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case BINARY_MULTIPLY:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case BINARY_DIVIDE:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case BINARY_MODULO:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case BINARY_ADD:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-07-17 20:12:42 -03:00
|
|
|
if (PyInt_Check(v) && PyInt_Check(w)) {
|
|
|
|
/* INLINE: int + int */
|
|
|
|
register long a, b, i;
|
1998-12-04 14:51:36 -04:00
|
|
|
a = PyInt_AS_LONG(v);
|
|
|
|
b = PyInt_AS_LONG(w);
|
1997-07-17 20:12:42 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case BINARY_SUBTRACT:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-07-17 20:12:42 -03:00
|
|
|
if (PyInt_Check(v) && PyInt_Check(w)) {
|
|
|
|
/* INLINE: int - int */
|
|
|
|
register long a, b, i;
|
1998-12-04 14:51:36 -04:00
|
|
|
a = PyInt_AS_LONG(v);
|
|
|
|
b = PyInt_AS_LONG(w);
|
1997-07-17 20:12:42 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case BINARY_SUBSCR:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-07-17 20:12:42 -03:00
|
|
|
if (PyList_Check(v) && PyInt_Check(w)) {
|
|
|
|
/* INLINE: list[int] */
|
|
|
|
long i = PyInt_AsLong(w);
|
|
|
|
if (i < 0)
|
1998-07-08 12:02:37 -03:00
|
|
|
i += PyList_GET_SIZE(v);
|
1997-07-17 20:12:42 -03:00
|
|
|
if (i < 0 ||
|
1998-07-08 12:02:37 -03:00
|
|
|
i >= PyList_GET_SIZE(v)) {
|
1997-07-17 20:12:42 -03:00
|
|
|
PyErr_SetString(PyExc_IndexError,
|
|
|
|
"list index out of range");
|
|
|
|
x = NULL;
|
|
|
|
}
|
|
|
|
else {
|
1998-07-08 12:02:37 -03:00
|
|
|
x = PyList_GET_ITEM(v, i);
|
1997-07-17 20:12:42 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-10-24 11:59:31 -03:00
|
|
|
case BINARY_LSHIFT:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1991-10-24 11:59:31 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-10-24 11:59:31 -03:00
|
|
|
case BINARY_RSHIFT:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1991-10-24 11:59:31 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-10-24 11:59:31 -03:00
|
|
|
case BINARY_AND:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1991-10-24 11:59:31 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-10-24 11:59:31 -03:00
|
|
|
case BINARY_XOR:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1991-10-24 11:59:31 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-10-24 11:59:31 -03:00
|
|
|
case BINARY_OR:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-05-06 12:06:49 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1991-10-24 11:59:31 -03:00
|
|
|
break;
|
2000-08-24 17:11:32 -03:00
|
|
|
|
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
|
|
|
|
1990-11-18 13:33:06 -04:00
|
|
|
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)
|
1990-11-18 13:33:06 -04:00
|
|
|
w = POP();
|
|
|
|
else
|
|
|
|
w = NULL;
|
1990-12-20 11:06:42 -04:00
|
|
|
if ((opcode-SLICE) & 1)
|
1990-11-18 13:33:06 -04:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:33:06 -04:00
|
|
|
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)
|
1990-11-18 13:33:06 -04:00
|
|
|
w = POP();
|
|
|
|
else
|
|
|
|
w = NULL;
|
1990-12-20 11:06:42 -04:00
|
|
|
if ((opcode-STORE_SLICE) & 1)
|
1990-11-18 13:33:06 -04:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (err == 0) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:33:06 -04:00
|
|
|
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)
|
1990-11-18 13:33:06 -04:00
|
|
|
w = POP();
|
|
|
|
else
|
|
|
|
w = NULL;
|
1990-12-20 11:06:42 -04:00
|
|
|
if ((opcode-DELETE_SLICE) & 1)
|
1990-11-18 13:33:06 -04:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (err == 0) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case STORE_SUBSCR:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
|
|
|
u = POP();
|
|
|
|
/* v[w] = u */
|
1997-05-06 12:06:49 -03:00
|
|
|
err = PyObject_SetItem(v, w, u);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(u);
|
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(w);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (err == 0) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case DELETE_SUBSCR:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
|
|
|
/* del v[w] */
|
1997-05-06 12:06:49 -03:00
|
|
|
err = PyObject_DelItem(v, w);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(w);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (err == 0) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2000-08-21 12:44:01 -03:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case PRINT_EXPR:
|
|
|
|
v = POP();
|
2001-01-11 01:41:27 -04:00
|
|
|
w = PySys_GetObject("displayhook");
|
|
|
|
if (w == NULL) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"lost sys.displayhook");
|
|
|
|
err = -1;
|
2001-01-11 07:55:37 -04:00
|
|
|
x = NULL;
|
2001-01-11 01:41:27 -04:00
|
|
|
}
|
|
|
|
if (err == 0) {
|
|
|
|
x = Py_BuildValue("(O)", v);
|
|
|
|
if (x == NULL)
|
|
|
|
err = -1;
|
|
|
|
}
|
|
|
|
if (err == 0) {
|
|
|
|
w = PyEval_CallObject(w, x);
|
2001-01-11 07:55:37 -04:00
|
|
|
Py_XDECREF(w);
|
2001-01-11 01:41:27 -04:00
|
|
|
if (w == NULL)
|
|
|
|
err = -1;
|
1997-04-29 15:18:01 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
2001-01-11 01:41:27 -04:00
|
|
|
Py_XDECREF(x);
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-11 01:41:27 -04:00
|
|
|
|
2000-08-21 12:44:01 -03:00
|
|
|
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();
|
2000-08-29 01:56:13 -03:00
|
|
|
if (stream == NULL || stream == Py_None) {
|
2000-08-21 12:44:01 -03:00
|
|
|
w = PySys_GetObject("stdout");
|
|
|
|
if (w == NULL) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"lost sys.stdout");
|
|
|
|
err = -1;
|
|
|
|
}
|
1997-12-31 01:53:15 -04:00
|
|
|
}
|
2000-08-21 12:44:01 -03:00
|
|
|
if (w != NULL && PyFile_SoftSpace(w, 1))
|
1997-05-22 19:26:18 -03:00
|
|
|
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)) {
|
1993-11-05 06:22:19 -04:00
|
|
|
/* 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])) &&
|
1993-11-05 06:22:19 -04:00
|
|
|
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);
|
2000-08-21 12:44:01 -03:00
|
|
|
Py_XDECREF(stream);
|
|
|
|
stream = NULL;
|
|
|
|
if (err == 0)
|
|
|
|
continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-21 12:44:01 -03:00
|
|
|
case PRINT_NEWLINE_TO:
|
|
|
|
w = stream = POP();
|
|
|
|
/* fall through to PRINT_NEWLINE */
|
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case PRINT_NEWLINE:
|
2000-08-29 01:56:13 -03:00
|
|
|
if (stream == NULL || stream == Py_None) {
|
2000-08-21 12:44:01 -03:00
|
|
|
w = PySys_GetObject("stdout");
|
|
|
|
if (w == NULL)
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"lost sys.stdout");
|
|
|
|
}
|
|
|
|
if (w != NULL) {
|
|
|
|
err = PyFile_WriteString("\n", w);
|
1997-05-22 19:26:18 -03:00
|
|
|
if (err == 0)
|
2000-08-21 12:44:01 -03:00
|
|
|
PyFile_SoftSpace(w, 0);
|
1992-09-25 18:59:05 -03:00
|
|
|
}
|
2000-08-21 12:44:01 -03:00
|
|
|
Py_XDECREF(stream);
|
|
|
|
stream = NULL;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
|
|
|
|
#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;
|
2001-03-21 15:17:22 -04:00
|
|
|
|
2001-02-01 18:48:12 -04:00
|
|
|
case CONTINUE_LOOP:
|
|
|
|
retval = PyInt_FromLong(oparg);
|
|
|
|
why = WHY_CONTINUE;
|
|
|
|
break;
|
1995-07-07 19:53:21 -03:00
|
|
|
|
|
|
|
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 */
|
1996-12-10 14:07:35 -04:00
|
|
|
why = do_raise(w, v, u);
|
1995-07-07 19:53:21 -03:00
|
|
|
break;
|
|
|
|
default:
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_SetString(PyExc_SystemError,
|
1995-07-07 19:53:21 -03:00
|
|
|
"bad RAISE_VARARGS oparg");
|
|
|
|
why = WHY_EXCEPTION;
|
1996-12-10 14:07:35 -04:00
|
|
|
break;
|
|
|
|
}
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:33:06 -04:00
|
|
|
case LOAD_LOCALS:
|
1995-07-18 11:51:37 -03:00
|
|
|
if ((x = f->f_locals) == NULL) {
|
1997-05-05 17:56:21 -03:00
|
|
|
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);
|
1990-11-18 13:33:06 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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;
|
1993-10-18 14:06:59 -03:00
|
|
|
|
|
|
|
case EXEC_STMT:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
|
|
|
u = POP();
|
1997-05-05 17:56:21 -03:00
|
|
|
err = exec_statement(f, u, v, w);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(u);
|
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(w);
|
1993-10-18 14:06:59 -03:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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);
|
2001-02-01 18:48:12 -04:00
|
|
|
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();
|
1995-07-07 19:53:21 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:33:06 -04:00
|
|
|
case BUILD_CLASS:
|
1993-05-19 11:50:45 -03:00
|
|
|
u = POP();
|
1990-11-18 13:33:06 -04:00
|
|
|
v = POP();
|
1993-05-19 11:50:45 -03:00
|
|
|
w = POP();
|
|
|
|
x = build_class(u, v, w);
|
1990-11-18 13:33:06 -04:00
|
|
|
PUSH(x);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(u);
|
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(w);
|
1990-11-18 13:33:06 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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) {
|
2001-01-18 23:25:05 -04:00
|
|
|
PyErr_Format(PyExc_SystemError,
|
|
|
|
"no locals found when storing %s",
|
2001-02-01 16:20:45 -04:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case DELETE_NAME:
|
1991-08-16 05:56:04 -03:00
|
|
|
w = GETNAMEV(oparg);
|
1995-07-18 11:51:37 -03:00
|
|
|
if ((x = f->f_locals) == NULL) {
|
2001-01-18 23:25:05 -04:00
|
|
|
PyErr_Format(PyExc_SystemError,
|
|
|
|
"no locals when deleting %s",
|
2001-02-01 16:20:45 -04:00
|
|
|
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)
|
2001-01-17 11:42:30 -04:00
|
|
|
format_exc_check_arg(PyExc_NameError,
|
2000-08-30 17:25:01 -03:00
|
|
|
NAME_ERROR_MSG ,w);
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
1992-08-12 12:35:34 -03:00
|
|
|
|
2000-08-11 19:15:52 -03:00
|
|
|
case UNPACK_SEQUENCE:
|
1990-11-18 13:27:39 -04:00
|
|
|
v = POP();
|
1997-08-25 19:13:04 -03:00
|
|
|
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
|
|
|
}
|
|
|
|
}
|
1997-08-25 19:13:04 -03: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
|
|
|
}
|
1997-08-25 19:13:04 -03: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 {
|
1997-08-25 19:13:04 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case STORE_ATTR:
|
1993-03-29 06:43:31 -04:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case DELETE_ATTR:
|
1993-03-29 06:43:31 -04:00
|
|
|
w = GETNAMEV(oparg);
|
1990-11-18 13:27:39 -04:00
|
|
|
v = POP();
|
1997-05-05 17:56:21 -03:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-12-10 09:52:46 -04:00
|
|
|
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);
|
1991-12-10 09:52:46 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-12-10 09:52:46 -04:00
|
|
|
case DELETE_GLOBAL:
|
|
|
|
w = GETNAMEV(oparg);
|
1997-04-29 15:18:01 -03:00
|
|
|
if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
|
2000-08-30 17:25:01 -03:00
|
|
|
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);
|
1991-12-10 09:52:46 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case LOAD_NAME:
|
1991-08-16 05:56:04 -03:00
|
|
|
w = GETNAMEV(oparg);
|
1995-07-18 11:51:37 -03:00
|
|
|
if ((x = f->f_locals) == NULL) {
|
2001-01-18 23:25:05 -04:00
|
|
|
PyErr_Format(PyExc_SystemError,
|
|
|
|
"no locals when loading %s",
|
2001-02-01 16:20:45 -04:00
|
|
|
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);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (x == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
x = PyDict_GetItem(f->f_builtins, w);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (x == NULL) {
|
2000-08-30 17:25:01 -03:00
|
|
|
format_exc_check_arg(
|
2001-01-17 11:42:30 -04:00
|
|
|
PyExc_NameError,
|
2000-08-30 17:25:01 -03:00
|
|
|
NAME_ERROR_MSG ,w);
|
1991-04-04 06:40:29 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_INCREF(x);
|
1991-04-04 06:40:29 -04:00
|
|
|
PUSH(x);
|
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
case LOAD_GLOBAL:
|
1991-08-16 05:56:04 -03:00
|
|
|
w = GETNAMEV(oparg);
|
1997-04-29 15:18:01 -03:00
|
|
|
x = PyDict_GetItem(f->f_globals, w);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (x == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
x = PyDict_GetItem(f->f_builtins, w);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (x == NULL) {
|
2000-08-30 17:25:01 -03:00
|
|
|
format_exc_check_arg(
|
2001-01-17 11:42:30 -04:00
|
|
|
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);
|
1991-04-04 06:40:29 -04:00
|
|
|
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;
|
1993-03-29 06:43:31 -04:00
|
|
|
|
|
|
|
case LOAD_FAST:
|
1995-07-18 11:51:37 -03:00
|
|
|
x = GETLOCAL(oparg);
|
1993-03-30 09:18:41 -04:00
|
|
|
if (x == NULL) {
|
2000-08-30 17:25:01 -03:00
|
|
|
format_exc_check_arg(
|
|
|
|
PyExc_UnboundLocalError,
|
|
|
|
UNBOUNDLOCAL_ERROR_MSG,
|
|
|
|
PyTuple_GetItem(co->co_varnames, oparg)
|
|
|
|
);
|
1993-03-30 09:18:41 -04:00
|
|
|
break;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_INCREF(x);
|
1993-03-30 09:18:41 -04:00
|
|
|
PUSH(x);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1993-03-29 06:43:31 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case STORE_FAST:
|
1993-05-19 11:50:45 -03:00
|
|
|
v = POP();
|
1995-07-18 11:51:37 -03:00
|
|
|
SETLOCAL(oparg, v);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
1993-03-30 09:18:41 -04:00
|
|
|
|
|
|
|
case DELETE_FAST:
|
1998-05-12 17:27:36 -03:00
|
|
|
x = GETLOCAL(oparg);
|
|
|
|
if (x == NULL) {
|
2000-08-30 17:25:01 -03:00
|
|
|
format_exc_check_arg(
|
|
|
|
PyExc_UnboundLocalError,
|
|
|
|
UNBOUNDLOCAL_ERROR_MSG,
|
|
|
|
PyTuple_GetItem(co->co_varnames, oparg)
|
|
|
|
);
|
1998-05-12 17:27:36 -03:00
|
|
|
break;
|
|
|
|
}
|
1995-07-18 11:51:37 -03:00
|
|
|
SETLOCAL(oparg, NULL);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04: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 LOAD_CLOSURE:
|
2001-01-29 18:51:52 -04:00
|
|
|
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:
|
2001-01-29 18:51:52 -04:00
|
|
|
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);
|
2001-02-05 13:23:16 -04:00
|
|
|
if (w == NULL) {
|
2001-04-13 13:51:46 -03:00
|
|
|
if (oparg < f->f_ncells) {
|
2001-02-05 13:23:16 -04:00
|
|
|
v = PyTuple_GetItem(co->co_cellvars,
|
|
|
|
oparg);
|
2001-04-13 13:51:46 -03:00
|
|
|
format_exc_check_arg(
|
|
|
|
PyExc_UnboundLocalError,
|
|
|
|
UNBOUNDLOCAL_ERROR_MSG,
|
|
|
|
v);
|
|
|
|
} else {
|
2001-02-05 13:23:16 -04:00
|
|
|
v = PyTuple_GetItem(
|
|
|
|
co->co_freevars,
|
|
|
|
oparg - f->f_ncells);
|
2001-04-13 13:51:46 -03:00
|
|
|
format_exc_check_arg(
|
|
|
|
PyExc_NameError,
|
|
|
|
UNBOUNDFREE_ERROR_MSG,
|
|
|
|
v);
|
|
|
|
}
|
2001-02-05 13:23:16 -04:00
|
|
|
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
|
|
|
PUSH(w);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case STORE_DEREF:
|
|
|
|
w = POP();
|
2001-01-29 18:51:52 -04:00
|
|
|
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);
|
2001-03-12 21:58:22 -04:00
|
|
|
Py_DECREF(w);
|
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
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
}
|
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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();
|
1998-08-04 12:27:50 -03:00
|
|
|
PyList_SET_ITEM(x, oparg, w);
|
1990-11-18 13:27:39 -04:00
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
PUSH(x);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
}
|
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case LOAD_ATTR:
|
1993-03-29 06:43:31 -04:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case COMPARE_OP:
|
|
|
|
w = POP();
|
|
|
|
v = POP();
|
1997-07-17 20:12:42 -03:00
|
|
|
if (PyInt_Check(v) && PyInt_Check(w)) {
|
|
|
|
/* INLINE: cmp(int, int) */
|
|
|
|
register long a, b;
|
|
|
|
register int res;
|
1998-12-04 14:51:36 -04:00
|
|
|
a = PyInt_AS_LONG(v);
|
|
|
|
b = PyInt_AS_LONG(w);
|
1997-07-17 20:12:42 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case IMPORT_NAME:
|
1995-01-02 15:04:15 -04:00
|
|
|
w = GETNAMEV(oparg);
|
1997-04-29 15:18:01 -03:00
|
|
|
x = PyDict_GetItemString(f->f_builtins, "__import__");
|
1995-01-02 15:04:15 -04:00
|
|
|
if (x == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_SetString(PyExc_ImportError,
|
1997-05-06 12:06:49 -03:00
|
|
|
"__import__ not found");
|
1995-01-02 15:04:15 -04:00
|
|
|
break;
|
|
|
|
}
|
2000-08-27 17:31:27 -03:00
|
|
|
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,
|
1997-05-05 17:56:21 -03:00
|
|
|
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);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (w == NULL) {
|
|
|
|
x = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
x = PyEval_CallObject(x, w);
|
|
|
|
Py_DECREF(w);
|
1995-07-07 19:53:21 -03:00
|
|
|
PUSH(x);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-17 19:55:00 -03:00
|
|
|
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) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_SystemError,
|
2001-01-18 23:25:05 -04:00
|
|
|
"no locals found during 'import *'");
|
1995-07-18 11:51:37 -03:00
|
|
|
break;
|
|
|
|
}
|
2000-08-17 19:55:00 -03:00
|
|
|
err = import_all_from(x, v);
|
1997-04-29 15:18:01 -03:00
|
|
|
PyFrame_LocalsToFast(f, 0);
|
2000-08-17 19:55:00 -03:00
|
|
|
Py_DECREF(v);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (err == 0) continue;
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
1993-05-19 11:50:45 -03:00
|
|
|
|
2000-08-17 19:55:00 -03:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case JUMP_IF_FALSE:
|
1997-04-29 15:18:01 -03:00
|
|
|
err = PyObject_IsTrue(TOP());
|
1992-08-12 12:35:34 -03:00
|
|
|
if (err > 0)
|
|
|
|
err = 0;
|
|
|
|
else if (err == 0)
|
1990-12-20 11:06:42 -04:00
|
|
|
JUMPBY(oparg);
|
1997-01-17 22:46:13 -04:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case JUMP_IF_TRUE:
|
1997-04-29 15:18:01 -03:00
|
|
|
err = PyObject_IsTrue(TOP());
|
1992-08-12 12:35:34 -03:00
|
|
|
if (err > 0) {
|
|
|
|
err = 0;
|
1990-12-20 11:06:42 -04:00
|
|
|
JUMPBY(oparg);
|
1992-08-12 12:35:34 -03:00
|
|
|
}
|
1997-01-17 22:46:13 -04:00
|
|
|
else if (err == 0)
|
|
|
|
;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-11-18 13:27:39 -04:00
|
|
|
case JUMP_ABSOLUTE:
|
1990-12-20 11:06:42 -04:00
|
|
|
JUMPTO(oparg);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2001-04-20 16:13:02 -03:00
|
|
|
case GET_ITER:
|
|
|
|
/* before: [obj]; after [getiter(obj)] */
|
|
|
|
v = POP();
|
|
|
|
x = PyObject_GetIter(v);
|
|
|
|
Py_DECREF(v);
|
|
|
|
if (x != NULL) {
|
2001-04-23 11:08:49 -03:00
|
|
|
PUSH(x);
|
|
|
|
continue;
|
2001-04-20 16:13:02 -03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case FOR_ITER:
|
|
|
|
/* before: [iter]; after: [iter, iter()] *or* [] */
|
|
|
|
v = TOP();
|
2001-04-23 11:08:49 -03:00
|
|
|
x = PyIter_Next(v);
|
|
|
|
if (x != NULL) {
|
|
|
|
PUSH(x);
|
|
|
|
continue;
|
2001-04-20 16:13:02 -03:00
|
|
|
}
|
2001-05-04 21:14:56 -03:00
|
|
|
if (!PyErr_Occurred()) {
|
|
|
|
/* iterator ended normally */
|
|
|
|
x = v = POP();
|
2001-04-23 11:08:49 -03:00
|
|
|
Py_DECREF(v);
|
|
|
|
JUMPBY(oparg);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
2001-04-20 16:13:02 -03:00
|
|
|
|
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:
|
1990-11-18 13:33:06 -04:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
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;
|
1997-01-17 22:46:13 -04:00
|
|
|
else {
|
1990-12-20 11:06:42 -04:00
|
|
|
JUMPBY(oparg);
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
|
|
|
}
|
1990-11-18 13:27:39 -04:00
|
|
|
}
|
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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,
|
2001-02-01 18:48:12 -04:00
|
|
|
STACK_LEVEL());
|
1997-01-17 22:46:13 -04:00
|
|
|
continue;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
case SET_LINENO:
|
1992-01-11 22:29:51 -04:00
|
|
|
#ifdef LLTRACE
|
|
|
|
if (lltrace)
|
1995-01-02 15:04:15 -04:00
|
|
|
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;
|
1997-01-17 22:46:13 -04:00
|
|
|
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,
|
2001-06-16 18:02:31 -03:00
|
|
|
f, str_line, Py_None);
|
1990-11-18 13:27:39 -04:00
|
|
|
break;
|
1995-07-07 19:53:21 -03:00
|
|
|
|
|
|
|
case CALL_FUNCTION:
|
2001-01-03 19:52:36 -04:00
|
|
|
{
|
|
|
|
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)) {
|
2001-05-18 17:53:14 -03:00
|
|
|
int flags = PyCFunction_GET_FLAGS(func);
|
2001-05-29 13:23:26 -03:00
|
|
|
if (flags > 1 || nk != 0)
|
|
|
|
x = do_call(func, &stack_pointer,
|
|
|
|
na, nk);
|
|
|
|
else if (flags == METH_VARARGS) {
|
2001-05-18 17:53:14 -03:00
|
|
|
PyObject *callargs;
|
|
|
|
callargs = load_args(&stack_pointer, na);
|
|
|
|
x = call_cfunction(func, callargs, NULL);
|
|
|
|
Py_XDECREF(callargs);
|
2001-05-29 13:23:26 -03:00
|
|
|
} else if (flags == 0)
|
2001-01-03 19:52:36 -04:00
|
|
|
x = fast_cfunction(func,
|
2001-01-17 11:42:30 -04:00
|
|
|
&stack_pointer, na);
|
2001-01-03 19:52:36 -04:00
|
|
|
} else {
|
2001-01-17 11:42:30 -04:00
|
|
|
if (PyMethod_Check(func)
|
2001-01-03 19:52:36 -04:00
|
|
|
&& 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++;
|
2001-01-17 11:42:30 -04:00
|
|
|
} else
|
2001-01-03 19:52:36 -04:00
|
|
|
Py_INCREF(func);
|
|
|
|
if (PyFunction_Check(func)) {
|
|
|
|
x = fast_function(func, &stack_pointer,
|
2001-01-17 11:42:30 -04:00
|
|
|
n, na, nk);
|
2001-01-03 19:52:36 -04:00
|
|
|
} else {
|
|
|
|
x = do_call(func, &stack_pointer,
|
|
|
|
na, nk);
|
|
|
|
}
|
|
|
|
Py_DECREF(func);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (stack_pointer > pfunc) {
|
|
|
|
w = POP();
|
|
|
|
Py_DECREF(w);
|
|
|
|
}
|
|
|
|
PUSH(x);
|
2001-01-17 11:42:30 -04:00
|
|
|
if (x != NULL)
|
2001-01-03 19:52:36 -04:00
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-03-28 19:49:17 -04:00
|
|
|
case CALL_FUNCTION_VAR:
|
|
|
|
case CALL_FUNCTION_KW:
|
|
|
|
case CALL_FUNCTION_VAR_KW:
|
1995-07-07 19:53:21 -03:00
|
|
|
{
|
2000-03-28 19:49:17 -04:00
|
|
|
int na = oparg & 0xff;
|
|
|
|
int nk = (oparg>>8) & 0xff;
|
|
|
|
int flags = (opcode - CALL_FUNCTION) & 3;
|
2001-01-03 19:52:36 -04:00
|
|
|
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;
|
2000-03-28 19:49:17 -04:00
|
|
|
f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
|
2001-01-03 19:52:36 -04:00
|
|
|
|
2001-01-17 11:42:30 -04:00
|
|
|
if (PyMethod_Check(func)
|
2001-01-03 19:52:36 -04:00
|
|
|
&& PyMethod_GET_SELF(func) != NULL) {
|
|
|
|
PyObject *self = PyMethod_GET_SELF(func);
|
2000-03-28 19:49:17 -04:00
|
|
|
Py_INCREF(self);
|
2001-01-03 19:52:36 -04:00
|
|
|
func = PyMethod_GET_FUNCTION(func);
|
|
|
|
Py_INCREF(func);
|
2000-03-28 19:49:17 -04:00
|
|
|
Py_DECREF(*pfunc);
|
|
|
|
*pfunc = self;
|
|
|
|
na++;
|
|
|
|
n++;
|
2001-01-17 11:42:30 -04:00
|
|
|
} else
|
2001-01-03 19:52:36 -04:00
|
|
|
Py_INCREF(func);
|
|
|
|
x = ext_do_call(func, &stack_pointer, flags, na, nk);
|
2000-03-28 19:49:17 -04:00
|
|
|
Py_DECREF(func);
|
2001-01-03 19:52:36 -04:00
|
|
|
|
2000-03-28 19:49:17 -04:00
|
|
|
while (stack_pointer > pfunc) {
|
2001-01-03 19:52:36 -04:00
|
|
|
w = POP();
|
|
|
|
Py_DECREF(w);
|
2000-03-28 19:49:17 -04:00
|
|
|
}
|
|
|
|
PUSH(x);
|
2001-01-17 11:42:30 -04:00
|
|
|
if (x != NULL)
|
2001-01-03 19:52:36 -04:00
|
|
|
continue;
|
2000-03-28 19:49:17 -04:00
|
|
|
break;
|
1995-07-07 19:53:21 -03:00
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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();
|
1997-01-21 01:34:20 -04:00
|
|
|
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);
|
1997-01-17 22:46:13 -04:00
|
|
|
if (x != NULL) continue;
|
1996-07-30 13:49:37 -03:00
|
|
|
break;
|
|
|
|
|
2000-08-23 21:32:09 -03:00
|
|
|
case EXTENDED_ARG:
|
|
|
|
opcode = NEXTOP();
|
|
|
|
oparg = oparg<<16 | NEXTARG();
|
|
|
|
goto dispatch_opcode;
|
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;
|
1992-08-12 12:35:34 -03:00
|
|
|
|
|
|
|
#ifdef CASE_TOO_BIG
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
} /* switch */
|
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
on_error:
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Quickly continue if no error occurred */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
if (why == WHY_NOT) {
|
1995-07-18 11:51:37 -03:00
|
|
|
if (err == 0 && x != NULL) {
|
|
|
|
#ifdef CHECKEXC
|
1999-03-09 12:16:45 -04:00
|
|
|
/* 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 */
|
|
|
|
}
|
1991-04-04 06:40:29 -04:00
|
|
|
why = WHY_EXCEPTION;
|
1997-04-29 15:18:01 -03:00
|
|
|
x = Py_None;
|
1991-04-04 06:40:29 -04:00
|
|
|
err = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Double-check exception status */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
if (why == WHY_EXCEPTION || why == WHY_RERAISE) {
|
1997-04-29 15:18:01 -03:00
|
|
|
if (!PyErr_Occurred()) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_SystemError,
|
1999-03-09 12:16:45 -04:00
|
|
|
"error return without exception set");
|
1991-04-04 06:40:29 -04:00
|
|
|
why = WHY_EXCEPTION;
|
|
|
|
}
|
|
|
|
}
|
1999-03-09 12:16:45 -04:00
|
|
|
#ifdef CHECKEXC
|
1991-04-04 06:40:29 -04:00
|
|
|
else {
|
1999-03-09 12:16:45 -04:00
|
|
|
/* 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;
|
|
|
|
}
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Log traceback info if this is a real exception */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
if (why == WHY_EXCEPTION) {
|
1992-01-11 22:29:51 -04:00
|
|
|
f->f_lasti = INSTR_OFFSET() - 1;
|
1991-04-04 06:40:29 -04:00
|
|
|
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
|
|
|
|
1994-08-30 05:01:59 -03:00
|
|
|
if (f->f_trace)
|
|
|
|
call_exc_trace(&f->f_trace, &f->f_trace, f);
|
1997-05-05 17:56:21 -03:00
|
|
|
if (tstate->sys_profilefunc)
|
|
|
|
call_exc_trace(&tstate->sys_profilefunc,
|
|
|
|
(PyObject**)0, f);
|
1998-11-23 17:09:51 -04:00
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
if (why == WHY_RERAISE)
|
|
|
|
why = WHY_EXCEPTION;
|
|
|
|
|
|
|
|
/* Unwind stacks if a (pseudo) exception occurred */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
while (why != WHY_NOT && f->f_iblock > 0) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyTryBlock *b = PyFrame_BlockPop(f);
|
2001-02-01 18:48:12 -04:00
|
|
|
|
|
|
|
if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
|
|
|
|
/* For a continue inside a try block,
|
|
|
|
don't pop the block for the loop. */
|
2001-03-21 15:17:22 -04:00
|
|
|
PyFrame_BlockSetup(f, b->b_type, b->b_level,
|
2001-02-01 18:48:12 -04:00
|
|
|
b->b_handler);
|
|
|
|
why = WHY_NOT;
|
|
|
|
JUMPTO(PyInt_AS_LONG(retval));
|
|
|
|
Py_DECREF(retval);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
while (STACK_LEVEL() > b->b_level) {
|
|
|
|
v = POP();
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(v);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
if (b->b_type == SETUP_LOOP && why == WHY_BREAK) {
|
|
|
|
why = WHY_NOT;
|
|
|
|
JUMPTO(b->b_handler);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (b->b_type == SETUP_FINALLY ||
|
1996-12-05 19:17:11 -04:00
|
|
|
(b->b_type == SETUP_EXCEPT &&
|
|
|
|
why == WHY_EXCEPTION)) {
|
1991-04-04 06:40:29 -04:00
|
|
|
if (why == WHY_EXCEPTION) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *exc, *val, *tb;
|
|
|
|
PyErr_Fetch(&exc, &val, &tb);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (val == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
val = Py_None;
|
|
|
|
Py_INCREF(val);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
/* 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) {
|
1997-08-28 19:36:40 -03:00
|
|
|
PyErr_NormalizeException(
|
|
|
|
&exc, &val, &tb);
|
1997-05-05 17:56:21 -03:00
|
|
|
set_exc_info(tstate,
|
|
|
|
exc, val, tb);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
PUSH(tb);
|
1991-04-04 06:40:29 -04:00
|
|
|
PUSH(val);
|
|
|
|
PUSH(exc);
|
|
|
|
}
|
|
|
|
else {
|
2001-02-01 18:48:12 -04:00
|
|
|
if (why == WHY_RETURN ||
|
|
|
|
why == CONTINUE_LOOP)
|
1991-04-04 06:40:29 -04:00
|
|
|
PUSH(retval);
|
1997-04-29 15:18:01 -03:00
|
|
|
v = PyInt_FromLong((long)why);
|
1991-04-04 06:40:29 -04:00
|
|
|
PUSH(v);
|
|
|
|
}
|
|
|
|
why = WHY_NOT;
|
|
|
|
JUMPTO(b->b_handler);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} /* unwind stack */
|
|
|
|
|
|
|
|
/* End the loop if we still have an error (or return) */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
if (why != WHY_NOT)
|
|
|
|
break;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
} /* main loop */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Pop remaining stack entries */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
while (!EMPTY()) {
|
|
|
|
v = POP();
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(v);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1992-01-11 22:29:51 -04:00
|
|
|
if (why != WHY_RETURN)
|
|
|
|
retval = NULL;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1994-08-30 05:01:59 -03:00
|
|
|
if (f->f_trace) {
|
1992-01-11 22:29:51 -04:00
|
|
|
if (why == WHY_RETURN) {
|
1994-08-30 05:01:59 -03:00
|
|
|
if (call_trace(&f->f_trace, &f->f_trace, f,
|
2001-06-16 18:02:31 -03:00
|
|
|
str_return, retval)) {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(retval);
|
1992-01-11 22:29:51 -04:00
|
|
|
retval = NULL;
|
1992-03-23 14:19:28 -04:00
|
|
|
why = WHY_EXCEPTION;
|
1992-01-11 22:29:51 -04:00
|
|
|
}
|
|
|
|
}
|
1992-03-23 14:19:28 -04:00
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
if (tstate->sys_profilefunc && why == WHY_RETURN) {
|
|
|
|
if (call_trace(&tstate->sys_profilefunc, (PyObject**)0,
|
2001-06-16 18:02:31 -03:00
|
|
|
f, str_return, retval)) {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(retval);
|
1992-03-23 14:19:28 -04:00
|
|
|
retval = NULL;
|
|
|
|
why = WHY_EXCEPTION;
|
|
|
|
}
|
1992-01-11 22:29:51 -04:00
|
|
|
}
|
1997-01-21 17:18:36 -04:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
reset_exc_info(tstate);
|
|
|
|
|
|
|
|
--tstate->recursion_depth;
|
1997-01-24 00:19:24 -04:00
|
|
|
|
|
|
|
fail: /* Jump here from prelude on failure */
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1991-04-04 06:40:29 -04:00
|
|
|
/* Restore previous frame and release the current one */
|
1995-07-18 11:51:37 -03:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
tstate->frame = f->f_back;
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(f);
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1992-01-11 22:29:51 -04:00
|
|
|
return retval;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
static void
|
2001-01-17 11:42:30 -04:00
|
|
|
set_exc_info(PyThreadState *tstate,
|
|
|
|
PyObject *type, PyObject *value, PyObject *tb)
|
1997-05-05 17:56:21 -03:00
|
|
|
{
|
|
|
|
PyFrameObject *frame;
|
1997-05-20 14:06:11 -03:00
|
|
|
PyObject *tmp_type, *tmp_value, *tmp_tb;
|
1997-08-22 18:26:19 -03:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
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;
|
|
|
|
}
|
1997-05-20 14:06:11 -03:00
|
|
|
tmp_type = frame->f_exc_type;
|
|
|
|
tmp_value = frame->f_exc_value;
|
|
|
|
tmp_tb = frame->f_exc_traceback;
|
1997-05-05 17:56:21 -03:00
|
|
|
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;
|
1997-05-20 14:06:11 -03:00
|
|
|
Py_XDECREF(tmp_type);
|
|
|
|
Py_XDECREF(tmp_value);
|
|
|
|
Py_XDECREF(tmp_tb);
|
1997-05-05 17:56:21 -03:00
|
|
|
}
|
|
|
|
/* Set new exception for this thread */
|
1997-05-20 14:06:11 -03:00
|
|
|
tmp_type = tstate->exc_type;
|
|
|
|
tmp_value = tstate->exc_value;
|
|
|
|
tmp_tb = tstate->exc_traceback;
|
1997-05-05 17:56:21 -03:00
|
|
|
Py_XINCREF(type);
|
|
|
|
Py_XINCREF(value);
|
|
|
|
Py_XINCREF(tb);
|
|
|
|
tstate->exc_type = type;
|
|
|
|
tstate->exc_value = value;
|
|
|
|
tstate->exc_traceback = tb;
|
1997-05-20 14:06:11 -03:00
|
|
|
Py_XDECREF(tmp_type);
|
|
|
|
Py_XDECREF(tmp_value);
|
|
|
|
Py_XDECREF(tmp_tb);
|
1997-05-05 17:56:21 -03:00
|
|
|
/* For b/w compatibility */
|
|
|
|
PySys_SetObject("exc_type", type);
|
|
|
|
PySys_SetObject("exc_value", value);
|
|
|
|
PySys_SetObject("exc_traceback", tb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-22 15:47:25 -03:00
|
|
|
reset_exc_info(PyThreadState *tstate)
|
1997-05-05 17:56:21 -03:00
|
|
|
{
|
|
|
|
PyFrameObject *frame;
|
1997-05-20 14:06:11 -03:00
|
|
|
PyObject *tmp_type, *tmp_value, *tmp_tb;
|
1997-05-05 17:56:21 -03:00
|
|
|
frame = tstate->frame;
|
|
|
|
if (frame->f_exc_type != NULL) {
|
|
|
|
/* This frame caught an exception */
|
1997-05-20 14:06:11 -03:00
|
|
|
tmp_type = tstate->exc_type;
|
|
|
|
tmp_value = tstate->exc_value;
|
|
|
|
tmp_tb = tstate->exc_traceback;
|
1997-05-05 17:56:21 -03:00
|
|
|
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;
|
1997-05-20 14:06:11 -03:00
|
|
|
Py_XDECREF(tmp_type);
|
|
|
|
Py_XDECREF(tmp_value);
|
|
|
|
Py_XDECREF(tmp_tb);
|
1997-05-05 17:56:21 -03:00
|
|
|
/* 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);
|
|
|
|
}
|
1997-05-20 14:06:11 -03:00
|
|
|
tmp_type = frame->f_exc_type;
|
|
|
|
tmp_value = frame->f_exc_value;
|
|
|
|
tmp_tb = frame->f_exc_traceback;
|
1997-05-05 17:56:21 -03:00
|
|
|
frame->f_exc_type = NULL;
|
|
|
|
frame->f_exc_value = NULL;
|
|
|
|
frame->f_exc_traceback = NULL;
|
1997-05-20 14:06:11 -03:00
|
|
|
Py_XDECREF(tmp_type);
|
|
|
|
Py_XDECREF(tmp_value);
|
|
|
|
Py_XDECREF(tmp_tb);
|
1997-05-05 17:56:21 -03:00
|
|
|
}
|
|
|
|
|
1996-12-10 14:07:35 -04:00
|
|
|
/* Logic for the raise statement (too complicated for inlining).
|
|
|
|
This *consumes* a reference count to each of its arguments. */
|
1997-01-21 01:34:20 -04:00
|
|
|
static enum why_code
|
2000-07-22 15:47:25 -03:00
|
|
|
do_raise(PyObject *type, PyObject *value, PyObject *tb)
|
1996-12-10 14:07:35 -04:00
|
|
|
{
|
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);
|
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1996-12-10 14:07:35 -04:00
|
|
|
/* 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);
|
1996-12-10 14:07:35 -04:00
|
|
|
tb = NULL;
|
|
|
|
}
|
|
|
|
else if (tb != NULL && !PyTraceBack_Check(tb)) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError,
|
2000-10-24 16:57:45 -03:00
|
|
|
"raise: arg 3 must be a traceback or None");
|
1996-12-10 14:07:35 -04:00
|
|
|
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);
|
1996-12-10 14:07:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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);
|
1996-12-10 14:07:35 -04:00
|
|
|
}
|
|
|
|
|
1997-08-22 18:26:19 -03:00
|
|
|
if (PyString_Check(type))
|
1996-12-10 14:07:35 -04:00
|
|
|
;
|
1997-08-22 18:26:19 -03:00
|
|
|
|
|
|
|
else if (PyClass_Check(type))
|
|
|
|
PyErr_NormalizeException(&type, &value, &tb);
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
else if (PyInstance_Check(type)) {
|
1996-12-10 14:07:35 -04:00
|
|
|
/* 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,
|
1996-12-10 14:07:35 -04:00
|
|
|
"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);
|
1996-12-10 14:07:35 -04:00
|
|
|
value = type;
|
1997-04-29 15:18:01 -03:00
|
|
|
type = (PyObject*) ((PyInstanceObject*)type)->in_class;
|
|
|
|
Py_INCREF(type);
|
1996-12-10 14:07:35 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Not something you can raise. You get an exception
|
|
|
|
anyway, just not what you specified :-) */
|
2001-04-26 23:25:33 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"exceptions must be strings, classes, or "
|
|
|
|
"instances, not %s", type->ob_type->tp_name);
|
1996-12-10 14:07:35 -04:00
|
|
|
goto raise_error;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_Restore(type, value, tb);
|
1996-12-10 14:07:35 -04:00
|
|
|
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);
|
1996-12-10 14:07:35 -04:00
|
|
|
return WHY_EXCEPTION;
|
|
|
|
}
|
|
|
|
|
1997-08-25 19:13:04 -03:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
unpack_sequence(PyObject *v, int argcnt, PyObject **sp)
|
1997-08-25 19:13:04 -03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
PyObject *w;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1997-08-25 19:13:04 -03:00
|
|
|
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:
|
1997-08-25 19:30:51 -03:00
|
|
|
for (; i > 0; i--, sp++)
|
|
|
|
Py_DECREF(*sp);
|
1997-08-25 19:13:04 -03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1992-01-11 22:29:51 -04:00
|
|
|
#ifdef LLTRACE
|
1991-04-04 06:40:29 -04:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
prtrace(PyObject *v, char *str)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
|
|
|
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 */
|
1991-04-04 06:40:29 -04:00
|
|
|
printf("\n");
|
2000-05-03 21:55:17 -03:00
|
|
|
return 1;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1992-03-23 14:19:28 -04:00
|
|
|
static void
|
2000-07-22 15:47:25 -03:00
|
|
|
call_exc_trace(PyObject **p_trace, PyObject **p_newtrace, PyFrameObject *f)
|
1992-03-23 14:19:28 -04:00
|
|
|
{
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *type, *value, *traceback, *arg;
|
1992-03-23 14:19:28 -04:00
|
|
|
int err;
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_Fetch(&type, &value, &traceback);
|
1992-04-09 11:58:08 -03:00
|
|
|
if (value == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
value = Py_None;
|
|
|
|
Py_INCREF(value);
|
1992-04-09 11:58:08 -03:00
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
arg = Py_BuildValue("(OOO)", type, value, traceback);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (arg == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_Restore(type, value, traceback);
|
1995-01-02 15:04:15 -04:00
|
|
|
return;
|
|
|
|
}
|
2001-06-16 18:02:31 -03:00
|
|
|
err = call_trace(p_trace, p_newtrace, f, str_exception, arg);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(arg);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (err == 0)
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_Restore(type, value, traceback);
|
1995-01-02 15:04:15 -04:00
|
|
|
else {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(type);
|
|
|
|
Py_XDECREF(value);
|
|
|
|
Py_XDECREF(traceback);
|
1992-03-23 14:19:28 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-07-22 15:47:25 -03:00
|
|
|
/* PyObject **p_trace: in/out; may not be NULL;
|
|
|
|
may not point to NULL variable initially
|
2001-06-08 01:33:09 -03:00
|
|
|
PyObject **p_newtrace: in/out; may be NULL;
|
2000-07-22 15:47:25 -03:00
|
|
|
may point to NULL variable;
|
2001-06-08 01:33:09 -03:00
|
|
|
may be same variable as p_newtrace
|
2001-06-16 18:02:31 -03:00
|
|
|
PyObject *msg: in; must not be NULL
|
2001-06-08 01:33:09 -03:00
|
|
|
*/
|
2000-07-22 15:47:25 -03:00
|
|
|
|
1992-03-23 14:19:28 -04:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
call_trace(PyObject **p_trace, PyObject **p_newtrace, PyFrameObject *f,
|
2001-06-16 18:02:31 -03:00
|
|
|
PyObject *msg, PyObject *arg)
|
1992-01-11 22:29:51 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
PyThreadState *tstate = f->f_tstate;
|
2001-06-16 18:02:31 -03:00
|
|
|
PyObject *args;
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *res = NULL;
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1997-05-05 17:56:21 -03:00
|
|
|
if (tstate->tracing) {
|
1992-03-23 14:19:28 -04:00
|
|
|
/* Don't do recursive traces */
|
|
|
|
if (p_newtrace) {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(*p_newtrace);
|
1992-03-23 14:19:28 -04:00
|
|
|
*p_newtrace = NULL;
|
|
|
|
}
|
|
|
|
return 0;
|
1992-01-11 22:29:51 -04:00
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
args = PyTuple_New(3);
|
1995-07-07 19:53:21 -03:00
|
|
|
if (args == NULL)
|
1997-08-04 23:18:01 -03:00
|
|
|
goto cleanup;
|
2001-06-16 18:02:31 -03:00
|
|
|
Py_INCREF(msg);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_INCREF(f);
|
|
|
|
PyTuple_SET_ITEM(args, 0, (PyObject *)f);
|
2001-06-16 18:02:31 -03:00
|
|
|
PyTuple_SET_ITEM(args, 1, msg);
|
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);
|
1997-05-05 17:56:21 -03:00
|
|
|
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);
|
1997-05-05 17:56:21 -03:00
|
|
|
tstate->tracing--;
|
1997-08-04 23:18:01 -03:00
|
|
|
cleanup:
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(args);
|
1992-03-23 14:19:28 -04:00
|
|
|
if (res == NULL) {
|
|
|
|
/* The trace proc raised an exception */
|
1997-04-29 15:18:01 -03:00
|
|
|
PyTraceBack_Here(f);
|
|
|
|
Py_XDECREF(*p_trace);
|
1992-03-23 14:19:28 -04:00
|
|
|
*p_trace = NULL;
|
|
|
|
if (p_newtrace) {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(*p_newtrace);
|
1992-03-23 14:19:28 -04:00
|
|
|
*p_newtrace = NULL;
|
|
|
|
}
|
1999-09-08 13:26:33 -03:00
|
|
|
/* 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;
|
1992-04-05 11:18:13 -03:00
|
|
|
return -1;
|
1992-03-23 14:19:28 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (p_newtrace) {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_XDECREF(*p_newtrace);
|
|
|
|
if (res == Py_None)
|
1992-03-23 14:19:28 -04:00
|
|
|
*p_newtrace = NULL;
|
|
|
|
else {
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_INCREF(res);
|
1992-03-23 14:19:28 -04:00
|
|
|
*p_newtrace = res;
|
|
|
|
}
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(res);
|
1992-03-23 14:19:28 -04:00
|
|
|
return 0;
|
1992-04-05 11:18:13 -03:00
|
|
|
}
|
1992-01-11 22:29:51 -04:00
|
|
|
}
|
|
|
|
|
2001-06-16 18:02:31 -03:00
|
|
|
/* Initialize the strings that get passed to the profile and trace functions;
|
|
|
|
* this avoids doing this while we're actually profiling/tracing.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
_PyTrace_Init(void)
|
|
|
|
{
|
|
|
|
if (str_call == NULL) {
|
|
|
|
str_call = PyString_InternFromString("call");
|
|
|
|
if (str_call == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (str_exception == NULL) {
|
|
|
|
str_exception = PyString_InternFromString("exception");
|
|
|
|
if (str_exception == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (str_line == NULL) {
|
|
|
|
str_line = PyString_InternFromString("line");
|
|
|
|
if (str_line == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (str_return == NULL) {
|
|
|
|
str_return = PyString_InternFromString("return");
|
|
|
|
if (str_return == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_GetBuiltins(void)
|
1995-01-09 13:53:26 -04:00
|
|
|
{
|
1997-08-02 00:10:38 -03:00
|
|
|
PyThreadState *tstate = PyThreadState_Get();
|
|
|
|
PyFrameObject *current_frame = tstate->frame;
|
1995-01-09 13:53:26 -04:00
|
|
|
if (current_frame == NULL)
|
1997-08-02 00:10:38 -03:00
|
|
|
return tstate->interp->builtins;
|
1995-01-09 13:53:26 -04:00
|
|
|
else
|
|
|
|
return current_frame->f_builtins;
|
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_GetLocals(void)
|
1993-03-30 13:46:03 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
PyFrameObject *current_frame = PyThreadState_Get()->frame;
|
1993-03-30 13:46:03 -04:00
|
|
|
if (current_frame == NULL)
|
|
|
|
return NULL;
|
1997-04-29 15:18:01 -03:00
|
|
|
PyFrame_FastToLocals(current_frame);
|
1993-03-30 13:46:03 -04:00
|
|
|
return current_frame->f_locals;
|
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_GetGlobals(void)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
PyFrameObject *current_frame = PyThreadState_Get()->frame;
|
1991-04-04 06:40:29 -04:00
|
|
|
if (current_frame == NULL)
|
|
|
|
return NULL;
|
|
|
|
else
|
|
|
|
return current_frame->f_globals;
|
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_GetFrame(void)
|
1994-08-30 05:01:59 -03:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
PyFrameObject *current_frame = PyThreadState_Get()->frame;
|
1997-04-29 15:18:01 -03:00
|
|
|
return (PyObject *)current_frame;
|
1994-08-30 05:01:59 -03:00
|
|
|
}
|
|
|
|
|
1995-01-09 13:53:26 -04:00
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_GetRestricted(void)
|
1995-01-09 13:53:26 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
PyFrameObject *current_frame = PyThreadState_Get()->frame;
|
1995-01-09 13:53:26 -04:00
|
|
|
return current_frame == NULL ? 0 : current_frame->f_restricted;
|
|
|
|
}
|
|
|
|
|
2001-03-21 22:32:48 -04:00
|
|
|
int
|
|
|
|
PyEval_GetNestedScopes(void)
|
|
|
|
{
|
|
|
|
PyFrameObject *current_frame = PyThreadState_Get()->frame;
|
|
|
|
return current_frame == NULL ? 0 :
|
|
|
|
current_frame->f_code->co_flags & CO_NESTED;
|
|
|
|
}
|
|
|
|
|
1997-05-22 19:26:18 -03:00
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
Py_FlushLine(void)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *f = PySys_GetObject("stdout");
|
1997-05-22 19:26:18 -03:00
|
|
|
if (f == NULL)
|
|
|
|
return 0;
|
|
|
|
if (!PyFile_SoftSpace(f, 0))
|
|
|
|
return 0;
|
|
|
|
return PyFile_WriteString("\n", f);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-07-18 11:51:37 -03:00
|
|
|
/* External interface to call any callable object.
|
|
|
|
The arg must be a tuple or NULL. */
|
1991-07-27 18:32:34 -03:00
|
|
|
|
1997-08-30 12:02:50 -03:00
|
|
|
#undef PyEval_CallObject
|
|
|
|
/* for backward compatibility: export this interface */
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_CallObject(PyObject *func, PyObject *arg)
|
1991-07-27 18:32:34 -03:00
|
|
|
{
|
1997-04-29 15:18:01 -03:00
|
|
|
return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
|
1995-07-18 11:51:37 -03:00
|
|
|
}
|
1997-08-30 12:02:50 -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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw)
|
1995-07-18 11:51:37 -03:00
|
|
|
{
|
2001-01-03 19:52:36 -04: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)) {
|
1997-05-05 17:56:21 -03:00
|
|
|
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)) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"keyword list must be a dictionary");
|
2000-04-21 18:17:39 -03:00
|
|
|
Py_DECREF(arg);
|
1995-08-04 01:14:47 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2001-01-03 19:52:36 -04:00
|
|
|
result = call_object(func, arg, kw);
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(arg);
|
2001-01-03 19:52:36 -04:00
|
|
|
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.
|
|
|
|
*/
|
|
|
|
|
2001-04-11 10:52:29 -03:00
|
|
|
static char *
|
|
|
|
get_func_name(PyObject *func)
|
|
|
|
{
|
|
|
|
if (PyMethod_Check(func))
|
|
|
|
return get_func_name(PyMethod_GET_FUNCTION(func));
|
|
|
|
else if (PyFunction_Check(func))
|
|
|
|
return PyString_AsString(((PyFunctionObject*)func)->func_name);
|
|
|
|
else if (PyCFunction_Check(func))
|
|
|
|
return ((PyCFunctionObject*)func)->m_ml->ml_name;
|
|
|
|
else if (PyClass_Check(func))
|
|
|
|
return PyString_AsString(((PyClassObject*)func)->cl_name);
|
|
|
|
else if (PyInstance_Check(func)) {
|
|
|
|
return PyString_AsString(
|
|
|
|
((PyInstanceObject*)func)->in_class->cl_name);
|
|
|
|
} else {
|
|
|
|
return func->ob_type->tp_name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
|
|
|
get_func_desc(PyObject *func)
|
|
|
|
{
|
|
|
|
if (PyMethod_Check(func))
|
|
|
|
return "()";
|
|
|
|
else if (PyFunction_Check(func))
|
|
|
|
return "()";
|
|
|
|
else if (PyCFunction_Check(func))
|
|
|
|
return "()";
|
|
|
|
else if (PyClass_Check(func))
|
|
|
|
return " constructor";
|
|
|
|
else if (PyInstance_Check(func)) {
|
|
|
|
return " instance";
|
|
|
|
} else {
|
|
|
|
return " object";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-03 19:52:36 -04:00
|
|
|
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 {
|
2001-06-15 21:09:28 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"object of type '%.100s' is not callable",
|
|
|
|
func->ob_type->tp_name);
|
2001-01-03 19:52:36 -04:00
|
|
|
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");
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1994-08-30 05:01:59 -03:00
|
|
|
return result;
|
1991-07-27 18:32:34 -03:00
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
static PyObject *
|
2001-01-03 19:52:36 -04:00
|
|
|
call_cfunction(PyObject *func, PyObject *arg, PyObject *kw)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
2001-01-03 19:52:36 -04:00
|
|
|
PyCFunctionObject* f = (PyCFunctionObject*)func;
|
|
|
|
PyCFunction meth = PyCFunction_GET_FUNCTION(func);
|
|
|
|
PyObject *self = PyCFunction_GET_SELF(func);
|
|
|
|
int flags = PyCFunction_GET_FLAGS(func);
|
|
|
|
|
2001-01-04 18:33:02 -04:00
|
|
|
if (flags & METH_KEYWORDS) {
|
|
|
|
return (*(PyCFunctionWithKeywords)meth)(self, arg, kw);
|
2001-01-03 19:52:36 -04:00
|
|
|
}
|
2001-01-04 18:33:02 -04:00
|
|
|
if (kw != NULL && PyDict_Size(kw) != 0) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"%.200s() takes no keyword arguments",
|
|
|
|
f->m_ml->ml_name);
|
|
|
|
return NULL;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
2001-01-04 18:33:02 -04:00
|
|
|
if (flags & METH_VARARGS) {
|
|
|
|
return (*meth)(self, arg);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
2001-01-03 19:52:36 -04:00
|
|
|
if (!(flags & METH_VARARGS)) {
|
2001-01-04 18:33:02 -04:00
|
|
|
/* the really old style */
|
2001-01-03 19:52:36 -04:00
|
|
|
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);
|
1994-08-30 05:01:59 -03:00
|
|
|
}
|
2001-01-03 19:52:36 -04:00
|
|
|
/* should never get here ??? */
|
|
|
|
PyErr_BadInternalCall();
|
1991-04-04 06:40:29 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
static PyObject *
|
2001-01-03 19:52:36 -04:00
|
|
|
call_instance(PyObject *func, PyObject *arg, PyObject *kw)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
2001-01-03 19:52:36 -04:00
|
|
|
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;
|
|
|
|
}
|
2001-01-03 19:52:36 -04:00
|
|
|
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 */
|
2001-03-21 15:17:22 -04:00
|
|
|
int ok;
|
2001-01-03 19:52:36 -04:00
|
|
|
if (PyTuple_Size(arg) >= 1)
|
|
|
|
self = PyTuple_GET_ITEM(arg, 0);
|
2001-03-21 15:17:22 -04:00
|
|
|
if (self == NULL)
|
|
|
|
ok = 0;
|
|
|
|
else {
|
|
|
|
ok = PyObject_IsInstance(self, class);
|
|
|
|
if (ok < 0)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (!ok) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-04-13 13:51:46 -03:00
|
|
|
"unbound method %s%s must be "
|
2001-03-21 15:17:22 -04:00
|
|
|
"called with instance as first argument",
|
2001-04-13 13:51:46 -03:00
|
|
|
get_func_name(func), get_func_desc(func));
|
1991-04-04 06:40:29 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_INCREF(arg);
|
2001-03-21 15:17:22 -04:00
|
|
|
}
|
|
|
|
else {
|
2001-01-03 19:52:36 -04:00
|
|
|
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;
|
1994-08-30 05:01:59 -03:00
|
|
|
}
|
2001-01-03 19:52:36 -04:00
|
|
|
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);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
1995-07-18 11:51:37 -03:00
|
|
|
else {
|
|
|
|
d = NULL;
|
|
|
|
nd = 0;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
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;
|
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1995-07-18 11:51:37 -03:00
|
|
|
result = eval_code2(
|
2001-01-03 19:52:36 -04:00
|
|
|
(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));
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-05-03 20:44:39 -03:00
|
|
|
if (k != NULL)
|
|
|
|
PyMem_DEL(k);
|
2001-01-17 11:42:30 -04:00
|
|
|
|
1995-07-18 11:51:37 -03:00
|
|
|
return result;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
2001-01-03 19:52:36 -04:00
|
|
|
#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);
|
2001-01-10 18:11:59 -04:00
|
|
|
else if (na == 1) {
|
|
|
|
PyObject *arg = EXT_POP(*pp_stack);
|
2001-01-17 11:42:30 -04:00
|
|
|
PyObject *result = (*meth)(self, arg);
|
2001-01-10 18:11:59 -04:00
|
|
|
Py_DECREF(arg);
|
|
|
|
return result;
|
|
|
|
} else {
|
2001-01-03 19:52:36 -04:00
|
|
|
PyObject *args = load_args(pp_stack, na);
|
|
|
|
PyObject *result = (*meth)(self, args);
|
|
|
|
Py_DECREF(args);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2001-01-17 11:42:30 -04:00
|
|
|
fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
|
2001-01-03 19:52:36 -04:00
|
|
|
{
|
|
|
|
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);
|
2001-01-03 19:52:36 -04:00
|
|
|
PyObject **d = NULL;
|
|
|
|
int nd = 0;
|
|
|
|
|
|
|
|
if (argdefs != NULL) {
|
|
|
|
d = &PyTuple_GET_ITEM(argdefs, 0);
|
|
|
|
nd = ((PyTupleObject *)argdefs)->ob_size;
|
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
return eval_code2((PyCodeObject *)co, globals,
|
2001-01-03 19:52:36 -04:00
|
|
|
(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);
|
2001-01-03 19:52:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2001-01-15 18:14:16 -04:00
|
|
|
update_keyword_args(PyObject *orig_kwdict, int nk, PyObject ***pp_stack,
|
|
|
|
PyObject *func)
|
2001-01-03 19:52:36 -04:00
|
|
|
{
|
|
|
|
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) {
|
2001-01-17 11:42:30 -04:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-01-15 18:14:16 -04:00
|
|
|
"%.200s%s got multiple values "
|
2001-04-11 10:52:29 -03:00
|
|
|
"for keyword argument '%.200s'",
|
|
|
|
get_func_name(func),
|
|
|
|
get_func_desc(func),
|
|
|
|
PyString_AsString(key));
|
2001-01-03 19:52:36 -04:00
|
|
|
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) {
|
2001-01-15 18:14:16 -04:00
|
|
|
kwdict = update_keyword_args(NULL, nk, pp_stack, func);
|
2001-01-03 19:52:36 -04:00
|
|
|
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))) {
|
2001-01-15 18:14:16 -04:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2001-04-11 10:52:29 -03:00
|
|
|
"%s%s argument after ** "
|
|
|
|
"must be a dictionary",
|
|
|
|
get_func_name(func),
|
|
|
|
get_func_desc(func));
|
2001-01-03 19:52:36 -04:00
|
|
|
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) {
|
2001-04-11 10:52:29 -03:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"%s%s argument after * "
|
|
|
|
"must be a sequence",
|
|
|
|
get_func_name(func),
|
|
|
|
get_func_desc(func));
|
|
|
|
}
|
2001-01-03 19:52:36 -04:00
|
|
|
goto ext_call_fail;
|
|
|
|
}
|
|
|
|
Py_DECREF(stararg);
|
|
|
|
stararg = t;
|
|
|
|
}
|
|
|
|
nstar = PyTuple_GET_SIZE(stararg);
|
|
|
|
}
|
|
|
|
if (nk > 0) {
|
2001-01-15 18:14:16 -04:00
|
|
|
kwdict = update_keyword_args(kwdict, nk, pp_stack, func);
|
2001-01-03 19:52:36 -04:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
1996-07-30 15:40:29 -03:00
|
|
|
#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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
loop_subscript(PyObject *v, PyObject *w)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
1997-04-29 15:18:01 -03:00
|
|
|
PySequenceMethods *sq = v->ob_type->tp_as_sequence;
|
1994-08-30 05:01:59 -03:00
|
|
|
int i;
|
1998-05-21 21:52:29 -03:00
|
|
|
if (sq == NULL || sq->sq_item == NULL) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError, "loop over non-sequence");
|
1991-04-04 06:40:29 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
i = PyInt_AsLong(w);
|
1994-08-30 05:01:59 -03:00
|
|
|
v = (*sq->sq_item)(v, i);
|
|
|
|
if (v)
|
|
|
|
return v;
|
1997-08-22 18:26:19 -03:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_IndexError))
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_Clear();
|
1994-08-30 05:01:59 -03:00
|
|
|
return NULL;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
2000-05-08 11:06:50 -03:00
|
|
|
/* 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
|
2000-07-22 15:47:25 -03:00
|
|
|
_PyEval_SliceIndex(PyObject *v, int *pi)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
|
|
|
if (v != NULL) {
|
1997-05-05 17:56:21 -03:00
|
|
|
long x;
|
2000-02-23 18:18:48 -04:00
|
|
|
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;
|
2001-01-17 11:42:30 -04:00
|
|
|
int cmp;
|
2000-02-23 18:18:48 -04:00
|
|
|
|
2001-01-17 11:42:30 -04:00
|
|
|
if (!PyErr_ExceptionMatches(
|
|
|
|
PyExc_OverflowError)) {
|
|
|
|
/* It's not an overflow error, so just
|
2000-02-23 18:18:48 -04:00
|
|
|
signal an error */
|
2000-05-08 11:06:50 -03:00
|
|
|
return 0;
|
2000-02-23 18:18:48 -04:00
|
|
|
}
|
|
|
|
|
2001-01-17 11:42:30 -04:00
|
|
|
/* 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
|
2000-02-23 18:18:48 -04:00
|
|
|
the error. */
|
|
|
|
|
|
|
|
/* Create a long integer with a value of 0 */
|
2001-01-17 11:42:30 -04:00
|
|
|
long_zero = PyLong_FromLong(0L);
|
2000-05-08 11:06:50 -03:00
|
|
|
if (long_zero == NULL) return 0;
|
2000-02-23 18:18:48 -04:00
|
|
|
|
|
|
|
/* Check sign */
|
2001-01-17 11:42:30 -04:00
|
|
|
cmp = PyObject_RichCompareBool(v, long_zero,
|
|
|
|
Py_GT);
|
|
|
|
Py_DECREF(long_zero);
|
|
|
|
if (cmp < 0)
|
|
|
|
return 0;
|
|
|
|
else if (cmp > 0)
|
2000-02-23 18:18:48 -04:00
|
|
|
x = INT_MAX;
|
|
|
|
else
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
} else {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError,
|
2000-10-24 16:57:45 -03:00
|
|
|
"slice indices must be integers");
|
2000-05-08 11:06:50 -03:00
|
|
|
return 0;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
1997-05-05 17:56:21 -03:00
|
|
|
/* Truncate -- very long indices are truncated anyway */
|
|
|
|
if (x > INT_MAX)
|
|
|
|
x = INT_MAX;
|
|
|
|
else if (x < -INT_MAX)
|
|
|
|
x = 0;
|
|
|
|
*pi = x;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
2000-05-08 11:06:50 -03:00
|
|
|
return 1;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
apply_slice(PyObject *u, PyObject *v, PyObject *w) /* return u[v:w] */
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
int ilow = 0, ihigh = INT_MAX;
|
2000-05-08 11:06:50 -03:00
|
|
|
if (!_PyEval_SliceIndex(v, &ilow))
|
1991-04-04 06:40:29 -04:00
|
|
|
return NULL;
|
2000-05-08 11:06:50 -03:00
|
|
|
if (!_PyEval_SliceIndex(w, &ihigh))
|
1992-08-12 12:35:34 -03:00
|
|
|
return NULL;
|
1997-05-05 17:56:21 -03:00
|
|
|
return PySequence_GetSlice(u, ilow, ihigh);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2001-01-17 11:42:30 -04:00
|
|
|
assign_slice(PyObject *u, PyObject *v, PyObject *w, PyObject *x)
|
|
|
|
/* u[v:w] = x */
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
1997-05-05 17:56:21 -03:00
|
|
|
int ilow = 0, ihigh = INT_MAX;
|
2000-05-08 11:06:50 -03:00
|
|
|
if (!_PyEval_SliceIndex(v, &ilow))
|
1992-08-12 12:35:34 -03:00
|
|
|
return -1;
|
2000-05-08 11:06:50 -03:00
|
|
|
if (!_PyEval_SliceIndex(w, &ihigh))
|
1991-04-04 06:40:29 -04:00
|
|
|
return -1;
|
1997-05-05 17:56:21 -03:00
|
|
|
if (x == NULL)
|
|
|
|
return PySequence_DelSlice(u, ilow, ihigh);
|
|
|
|
else
|
|
|
|
return PySequence_SetSlice(u, ilow, ihigh, x);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
cmp_outcome(int op, register PyObject *v, register PyObject *w)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
2001-01-17 11:42:30 -04:00
|
|
|
int res = 0;
|
1991-04-04 06:40:29 -04:00
|
|
|
switch (op) {
|
|
|
|
case IS:
|
|
|
|
case IS_NOT:
|
|
|
|
res = (v == w);
|
1992-08-12 12:35:34 -03:00
|
|
|
if (op == (int) IS_NOT)
|
1991-04-04 06:40:29 -04:00
|
|
|
res = !res;
|
|
|
|
break;
|
|
|
|
case IN:
|
|
|
|
case NOT_IN:
|
1998-05-21 21:52:29 -03:00
|
|
|
res = PySequence_Contains(w, v);
|
1991-04-04 06:40:29 -04:00
|
|
|
if (res < 0)
|
|
|
|
return NULL;
|
1992-08-12 12:35:34 -03:00
|
|
|
if (op == (int) NOT_IN)
|
1991-04-04 06:40:29 -04:00
|
|
|
res = !res;
|
|
|
|
break;
|
|
|
|
case EXC_MATCH:
|
1997-08-22 18:26:19 -03:00
|
|
|
res = PyErr_GivenExceptionMatches(v, w);
|
1991-04-04 06:40:29 -04:00
|
|
|
break;
|
|
|
|
default:
|
2001-01-17 11:42:30 -04:00
|
|
|
return PyObject_RichCompare(v, w, op);
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
v = res ? Py_True : Py_False;
|
|
|
|
Py_INCREF(v);
|
1991-04-04 06:40:29 -04:00
|
|
|
return v;
|
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
|
2000-08-17 19:55:00 -03:00
|
|
|
static PyObject *
|
|
|
|
import_from(PyObject *v, PyObject *name)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
2001-01-12 12:24:03 -04:00
|
|
|
PyObject *x;
|
|
|
|
|
|
|
|
x = PyObject_GetAttr(v, name);
|
|
|
|
if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
2000-08-17 19:55:00 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"cannot import name %.230s",
|
|
|
|
PyString_AsString(name));
|
2001-01-12 12:24:03 -04:00
|
|
|
}
|
2000-08-17 19:55:00 -03:00
|
|
|
return x;
|
|
|
|
}
|
2001-01-17 11:42:30 -04:00
|
|
|
|
2000-08-17 19:55:00 -03:00
|
|
|
static int
|
|
|
|
import_all_from(PyObject *locals, PyObject *v)
|
|
|
|
{
|
2001-01-12 12:24:03 -04:00
|
|
|
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;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
2000-08-17 19:55:00 -03:00
|
|
|
|
2001-01-12 12:24:03 -04:00
|
|
|
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);
|
2000-08-17 19:55:00 -03:00
|
|
|
if (err != 0)
|
2001-01-12 12:24:03 -04:00
|
|
|
break;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
2001-01-12 12:24:03 -04:00
|
|
|
Py_DECREF(all);
|
|
|
|
return err;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
|
1997-04-29 15:18:01 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
build_class(PyObject *methods, PyObject *bases, PyObject *name)
|
1991-04-04 06:40:29 -04:00
|
|
|
{
|
1997-08-22 13:56:16 -03:00
|
|
|
int i, n;
|
1997-04-29 15:18:01 -03:00
|
|
|
if (!PyTuple_Check(bases)) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_SystemError,
|
|
|
|
"build_class with non-tuple bases");
|
1993-05-19 11:50:45 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
if (!PyDict_Check(methods)) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_SystemError,
|
|
|
|
"build_class with non-dictionary");
|
1993-05-19 11:50:45 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
if (!PyString_Check(name)) {
|
1997-05-05 17:56:21 -03:00
|
|
|
PyErr_SetString(PyExc_SystemError,
|
2000-03-31 09:52:29 -04:00
|
|
|
"build_class with non-string name");
|
1993-05-19 11:50:45 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-08-22 13:56:16 -03:00
|
|
|
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)) {
|
1996-12-05 19:17:11 -04:00
|
|
|
/* 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
|
2000-07-16 09:04:32 -03:00
|
|
|
unextended Python it will never be triggered
|
1997-07-31 00:54:02 -03:00
|
|
|
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) {
|
1997-07-31 00:54:02 -03:00
|
|
|
Py_DECREF(callable);
|
1998-04-10 19:27:42 -03:00
|
|
|
}
|
1997-07-31 00:54:02 -03:00
|
|
|
return newclass;
|
1996-12-05 19:17:11 -04:00
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError,
|
1993-05-19 11:50:45 -03:00
|
|
|
"base is not a class object");
|
|
|
|
return NULL;
|
1991-04-04 06:40:29 -04:00
|
|
|
}
|
1990-11-18 13:27:39 -04:00
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
return PyClass_New(bases, methods, name);
|
1993-05-19 11:50:45 -03:00
|
|
|
}
|
|
|
|
|
1993-10-18 14:06:59 -03:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
exec_statement(PyFrameObject *f, PyObject *prog, PyObject *globals,
|
|
|
|
PyObject *locals)
|
1993-10-18 14:06:59 -03:00
|
|
|
{
|
|
|
|
int n;
|
1997-04-29 15:18:01 -03:00
|
|
|
PyObject *v;
|
1995-07-18 11:51:37 -03:00
|
|
|
int plain = 0;
|
1993-10-18 14:06:59 -03:00
|
|
|
|
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)) {
|
1993-10-18 14:06:59 -03:00
|
|
|
/* Backward compatibility hack */
|
1997-04-29 15:18:01 -03:00
|
|
|
globals = PyTuple_GetItem(prog, 1);
|
1993-10-18 14:06:59 -03:00
|
|
|
if (n == 3)
|
1997-04-29 15:18:01 -03:00
|
|
|
locals = PyTuple_GetItem(prog, 2);
|
|
|
|
prog = PyTuple_GetItem(prog, 0);
|
1993-10-18 14:06:59 -03:00
|
|
|
}
|
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;
|
|
|
|
}
|
1993-10-18 14:06:59 -03:00
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
else if (locals == Py_None)
|
1993-10-18 14:06:59 -03:00
|
|
|
locals = globals;
|
1997-04-29 15:18:01 -03:00
|
|
|
if (!PyString_Check(prog) &&
|
2000-09-19 18:04:18 -03:00
|
|
|
!PyUnicode_Check(prog) &&
|
1997-04-29 15:18:01 -03:00
|
|
|
!PyCode_Check(prog) &&
|
|
|
|
!PyFile_Check(prog)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
2001-01-17 11:42:30 -04:00
|
|
|
"exec: arg 1 must be a string, file, or code object");
|
2000-10-24 16:57:45 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!PyDict_Check(globals)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"exec: arg 2 must be a dictionary or None");
|
1993-10-18 14:06:59 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2000-10-24 16:57:45 -03:00
|
|
|
if (!PyDict_Check(locals)) {
|
1997-04-29 15:18:01 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError,
|
2000-10-24 16:57:45 -03:00
|
|
|
"exec: arg 3 must be a dictionary or None");
|
1993-10-18 14:06:59 -03:00
|
|
|
return -1;
|
|
|
|
}
|
1997-04-29 15:18:01 -03:00
|
|
|
if (PyDict_GetItemString(globals, "__builtins__") == NULL)
|
1997-05-05 17:56:21 -03:00
|
|
|
PyDict_SetItemString(globals, "__builtins__", f->f_builtins);
|
1997-04-29 15:18:01 -03:00
|
|
|
if (PyCode_Check(prog)) {
|
2000-01-12 18:45:54 -04:00
|
|
|
v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals);
|
1993-10-18 14:06:59 -03:00
|
|
|
}
|
2000-01-12 18:45:54 -04:00
|
|
|
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));
|
2001-03-21 22:47:58 -04:00
|
|
|
if (PyEval_GetNestedScopes()) {
|
|
|
|
PyCompilerFlags cf;
|
|
|
|
cf.cf_nested_scopes = 1;
|
|
|
|
v = PyRun_FileFlags(fp, name, Py_file_input, globals,
|
|
|
|
locals, &cf);
|
|
|
|
} else {
|
|
|
|
v = PyRun_File(fp, name, Py_file_input, globals,
|
|
|
|
locals);
|
|
|
|
}
|
1993-10-18 14:06:59 -03:00
|
|
|
}
|
2000-01-12 18:45:54 -04:00
|
|
|
else {
|
2000-09-19 18:04:18 -03:00
|
|
|
char *str;
|
|
|
|
if (PyString_AsStringAndSize(prog, &str, NULL))
|
2000-01-12 18:45:54 -04:00
|
|
|
return -1;
|
2001-03-21 22:47:58 -04:00
|
|
|
if (PyEval_GetNestedScopes()) {
|
|
|
|
PyCompilerFlags cf;
|
|
|
|
cf.cf_nested_scopes = 1;
|
|
|
|
v = PyRun_StringFlags(str, Py_file_input, globals,
|
|
|
|
locals, &cf);
|
|
|
|
} else
|
|
|
|
v = PyRun_String(str, Py_file_input, globals, locals);
|
1993-10-18 14:06:59 -03:00
|
|
|
}
|
2000-01-12 18:45:54 -04:00
|
|
|
if (plain)
|
|
|
|
PyFrame_LocalsToFast(f, 0);
|
1995-07-18 11:51:37 -03:00
|
|
|
if (v == NULL)
|
1993-10-18 14:06:59 -03:00
|
|
|
return -1;
|
1997-04-29 15:18:01 -03:00
|
|
|
Py_DECREF(v);
|
1993-10-18 14:06:59 -03:00
|
|
|
return 0;
|
|
|
|
}
|
1995-02-14 05:42:43 -04:00
|
|
|
|
2001-01-17 11:42:30 -04:00
|
|
|
static void
|
2000-08-30 17:25:01 -03:00
|
|
|
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);
|
|
|
|
}
|
1997-01-24 09:49:28 -04:00
|
|
|
|
|
|
|
#ifdef DYNAMIC_EXECUTION_PROFILE
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
getarray(long a[256])
|
1997-01-24 09:49:28 -04:00
|
|
|
{
|
|
|
|
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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
_Py_GetDXProfile(PyObject *self, PyObject *args)
|
1997-01-24 09:49:28 -04:00
|
|
|
{
|
|
|
|
#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
|