cpython-lru_cache-weakref: Python/ceval.c annotate

annotate Python/ceval.c @ 5758:bfe9ba74c19e legacy-trunk

Fix problem discovered by Greg McFarlane: when an imported module replaces its own entry in sys.module, reference count errors ensue; even if there is no reference count problem, it would be preferable for the import to yield the new thing in sys.modules anyway (if only because that's what later imports will yield). This opens the road to an official hack to implement a __getattr__ like feature for modules: stick an instance in sys.modules[__name__].

author	Guido van Rossum <guido@python.org>
date	Thu, 10 Jul 1997 18:00:45 +0000
parents	10e9cfa010f0
children	f1127d6fcd74

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	1 /***********************************************************
2062 d0d0a69b5ca3 Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2052 diff changeset	2 Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
d0d0a69b5ca3 Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2052 diff changeset	3 The Netherlands.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	4
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	5 All Rights Reserved
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	6
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	7 Permission to use, copy, modify, and distribute this software and its
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	8 documentation for any purpose and without fee is hereby granted,
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	9 provided that the above copyright notice appear in all copies and that
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	10 both that copyright notice and this permission notice appear in
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	12 Centrum or CWI or Corporation for National Research Initiatives or
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	13 CNRI not be used in advertising or publicity pertaining to
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	14 distribution of the software without specific, written prior
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	15 permission.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	16
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	17 While CWI is the initial source for this software, a modified version
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	18 is made available by the Corporation for National Research Initiatives
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	19 (CNRI) at the Internet address ftp://ftp.python.org.
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	20
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	21 STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	22 REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	23 MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	24 CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	25 DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	26 PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	27 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4040 diff changeset	28 PERFORMANCE OF THIS SOFTWARE.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	29
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	30 ******************************************************************/
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	31
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	32 /* Execute compiled code */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	34 /* XXX TO DO:
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	35 XXX how to pass arguments to call_trace?
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	36 XXX speed up searching for keywords by using a dictionary
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	37 XXX document it!
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	38 */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	39
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	40 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	41
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	42 #include "compile.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	43 #include "frameobject.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	44 #include "eval.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	45 #include "opcode.h"
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	47 #include <ctype.h>
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	48
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	49 #ifdef HAVE_LIMITS_H
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	50 #include <limits.h>
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	51 #else
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	52 #define INT_MAX 2147483647
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	53 #endif
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	54
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	55 /* Turn this on if your compiler chokes on the big switch: */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	56 /* #define CASE_TOO_BIG 1 */
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	57
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	58 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	59 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	60 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	61 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	64
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	65 /* Forward declarations */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	66
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	67 static PyObject eval_code2 Py_PROTO((PyCodeObject ,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	68 PyObject , PyObject ,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	69 PyObject **, int,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	70 PyObject **, int,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	71 PyObject **, int,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	72 PyObject *));
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	73 #ifdef LLTRACE
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	74 static int prtrace Py_PROTO((PyObject , char ));
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	75 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	76 static void call_exc_trace Py_PROTO((PyObject , PyObject,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	77 PyFrameObject *));
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	78 static int call_trace Py_PROTO((PyObject , PyObject ,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	79 PyFrameObject , char , PyObject *));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	80 static PyObject call_builtin Py_PROTO((PyObject , PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	81 static PyObject call_function Py_PROTO((PyObject , PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	82 static PyObject loop_subscript Py_PROTO((PyObject , PyObject *));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	83 static int slice_index Py_PROTO((PyObject , int ));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	84 static PyObject apply_slice Py_PROTO((PyObject , PyObject , PyObject ));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	85 static int assign_slice Py_PROTO((PyObject , PyObject ,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	86 PyObject , PyObject ));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	87 static int cmp_exception Py_PROTO((PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	88 static int cmp_member Py_PROTO((PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	89 static PyObject cmp_outcome Py_PROTO((int, PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	90 static int import_from Py_PROTO((PyObject , PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	91 static PyObject build_class Py_PROTO((PyObject , PyObject , PyObject ));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	92 static int exec_statement Py_PROTO((PyFrameObject *,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	93 PyObject , PyObject , PyObject *));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	94 static PyObject find_from_args Py_PROTO((PyFrameObject , int));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	95 static void set_exc_info Py_PROTO((PyThreadState *,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	96 PyObject , PyObject , PyObject *));
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	97 static void reset_exc_info Py_PROTO((PyThreadState *));
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	98
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	99
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	100 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	101 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	102 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	103 static long dxpairs[257][256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	104 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	105 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	106 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	107 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	108 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	109
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	110
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	111 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	112
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	113 #include <errno.h>
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	114 #include "thread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	115
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	116 extern int _PyThread_Started; /* Flag for Py_Exit */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	117
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	118 static type_lock interpreter_lock = 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	119 static long main_thread = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	120
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	121 void
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	122 PyEval_InitThreads()
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	123 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	124 if (interpreter_lock)
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	125 return;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	126 _PyThread_Started = 1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	127 interpreter_lock = allocate_lock();
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	128 acquire_lock(interpreter_lock, 1);
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	129 main_thread = get_thread_ident();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	130 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	131
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	132 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	133
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	134 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	135 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	136 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	137
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	138 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	139 PyEval_SaveThread()
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	140 {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	141 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	142 if (interpreter_lock) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	143 PyThreadState *tstate = PyThreadState_Swap(NULL);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	144 PyObject res = tstate ? (PyObject ) (tstate->frame) : NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	145 release_lock(interpreter_lock);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	146 return res;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	147 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	148 #endif
1271 2919b448e385 * Microscopic corrections to make things compile on the Cray APP. Guido van Rossum <guido@python.org> parents: 1263 diff changeset	149 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	150 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	151
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	152 void
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	153 PyEval_RestoreThread(x)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	154 PyObject *x;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	155 {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	156 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	157 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	158 int err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	159 err = errno;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	160 acquire_lock(interpreter_lock, 1);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	161 errno = err;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	162 PyThreadState_Swap(x ? ((PyFrameObject *)x)->f_tstate : NULL);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	163 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	164 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	165 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	166
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	167
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	168 /* Mechanism whereby asynchronously executing callbacks (e.g. UNIX
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	169 signal handlers or Mac I/O completion routines) can schedule calls
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	170 to a function to be called synchronously.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	171 The synchronous function is called with one void* argument.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	172 It should return 0 for success or -1 for failure -- failure should
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	173 be accompanied by an exception.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	174
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	175 If registry succeeds, the registry function returns 0; if it fails
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	176 (e.g. due to too many pending calls) it returns -1 (without setting
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	177 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	178
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	179 Note that because registry may occur from within signal handlers,
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	180 or other asynchronous events, calling malloc() is unsafe!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	181
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	182 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	183 Any thread can schedule pending calls, but only the main thread
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	184 will execute them.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	185 #endif
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	186
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	187 XXX WARNING! ASYNCHRONOUSLY EXECUTING CODE!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	188 There are two possible race conditions:
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	189 (1) nested asynchronous registry calls;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	190 (2) registry calls made while pending calls are being processed.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	191 While (1) is very unlikely, (2) is a real possibility.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	192 The current code is safe against (2), but not against (1).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	193 The safety against (2) is derived from the fact that only one
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	194 thread (the main thread) ever takes things out of the queue.
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	195
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	196 XXX Darn! With the advent of thread state, we should have an array
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	197 of pending calls per thread in the thread state! Later...
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	198 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	199
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	200 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	201 static struct {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	202 int (func) Py_PROTO((ANY ));
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	203 ANY *arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	204 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	205 static volatile int pendingfirst = 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	206 static volatile int pendinglast = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	207 static volatile int things_to_do = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	208
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	209 int
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	210 Py_AddPendingCall(func, arg)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	211 int (func) Py_PROTO((ANY ));
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	212 ANY *arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	213 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	214 static int busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	215 int i, j;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	216 /* XXX Begin critical section */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	217 /* XXX If you want this to be safe against nested
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	218 XXX asynchronous calls, you'll have to work harder! */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	219 if (busy)
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	220 return -1;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	221 busy = 1;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	222 i = pendinglast;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	223 j = (i + 1) % NPENDINGCALLS;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	224 if (j == pendingfirst)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	225 return -1; /* Queue full */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	226 pendingcalls[i].func = func;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	227 pendingcalls[i].arg = arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	228 pendinglast = j;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	229 things_to_do = 1; /* Signal main loop */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	230 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	231 /* XXX End critical section */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	232 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	233 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	234
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	235 int
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	236 Py_MakePendingCalls()
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	237 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	238 static int busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	239 #ifdef WITH_THREAD
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	240 if (main_thread && get_thread_ident() != main_thread)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	241 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	242 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	243 if (busy)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	244 return 0;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	245 busy = 1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	246 things_to_do = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	247 for (;;) {
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	248 int i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	249 int (func) Py_PROTO((ANY ));
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	250 ANY *arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	251 i = pendingfirst;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	252 if (i == pendinglast)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	253 break; /* Queue empty */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	254 func = pendingcalls[i].func;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	255 arg = pendingcalls[i].arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	256 pendingfirst = (i + 1) % NPENDINGCALLS;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	257 if (func(arg) < 0) {
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	258 busy = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	259 things_to_do = 1; /* We're not done yet */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	260 return -1;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	261 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	262 }
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	263 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	264 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	265 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	266
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	267
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	268 /* Status code for main loop (reason for stack unwind) */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	269
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	270 enum why_code {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	271 WHY_NOT, /* No error */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	272 WHY_EXCEPTION, /* Exception occurred */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	273 WHY_RERAISE, /* Exception re-raised by 'finally' */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	274 WHY_RETURN, /* 'return' statement */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	275 WHY_BREAK /* 'break' statement */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	276 };
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	277
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	278 static enum why_code do_raise Py_PROTO((PyObject , PyObject , PyObject *));
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	279
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	280
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	281 /* Backward compatible interface */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	282
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	283 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	284 PyEval_EvalCode(co, globals, locals)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	285 PyCodeObject *co;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	286 PyObject *globals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	287 PyObject *locals;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	288 {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	289 return eval_code2(co,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	290 globals, locals,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	291 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	292 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	293 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	294 (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	295 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	296
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	297
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	298 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	299
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	300 #ifndef MAX_RECURSION_DEPTH
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	301 #define MAX_RECURSION_DEPTH 10000
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	302 #endif
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	303
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	304 static PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	305 eval_code2(co, globals, locals,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	306 args, argcount, kws, kwcount, defs, defcount, owner)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	307 PyCodeObject *co;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	308 PyObject *globals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	309 PyObject *locals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	310 PyObject **args;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	311 int argcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	312 PyObject *kws; / length: 2kwcount /
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	313 int kwcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	314 PyObject **defs;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	315 int defcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	316 PyObject *owner;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	317 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	318 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	319 int lastopcode = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	320 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	321 register unsigned char *next_instr;
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	322 register int opcode = 0; /* Current opcode */
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	323 register int oparg = 0; /* Current opcode argument, if any */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	324 register PyObject **stack_pointer;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	325 register enum why_code why; /* Reason for block stack unwind */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	326 register int err; /* Error status -- nonzero if error */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	327 register PyObject x; / Result object -- NULL if error */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	328 register PyObject v; / Temporary objects popped off stack */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	329 register PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	330 register PyObject *u;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	331 register PyObject *t;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	332 register PyFrameObject f; / Current frame */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	333 register PyObject **fastlocals = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	334 PyObject retval = NULL; / Return value */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	335 PyThreadState *tstate = PyThreadState_Get();
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	336 #ifdef LLTRACE
1273 69a066b6b1ff (I suggest a recompile after getting this, the ceval.c bugfix may be crucial!) Guido van Rossum <guido@python.org> parents: 1271 diff changeset	337 int lltrace;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	338 #endif
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	339 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	340 /* Make it easier to find out where we are with a debugger */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	341 char *filename = PyString_AsString(co->co_filename);
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	342 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	343
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	344 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	345
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	346 #define GETCONST(i) Getconst(f, i)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	347 #define GETNAME(i) Getname(f, i)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	348 #define GETNAMEV(i) Getnamev(f, i)
5052 7841c48cdb5b Two small changes: Guido van Rossum <guido@python.org> parents: 5050 diff changeset	349 #define FIRST_INSTR() (GETUSTRINGVALUE(co->co_code))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	350 #define INSTR_OFFSET() (next_instr - FIRST_INSTR())
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	351 #define NEXTOP() (*next_instr++)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	352 #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	353 #define JUMPTO(x) (next_instr = FIRST_INSTR() + (x))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	354 #define JUMPBY(x) (next_instr += (x))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	355
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	356 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	357
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	358 #define STACK_LEVEL() (stack_pointer - f->f_valuestack)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	359 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	360 #define TOP() (stack_pointer[-1])
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	361 #define BASIC_PUSH(v) (*stack_pointer++ = (v))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	362 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	363
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	364 #ifdef LLTRACE
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	365 #define PUSH(v) (BASIC_PUSH(v), lltrace && prtrace(TOP(), "push"))
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	366 #define POP() (lltrace && prtrace(TOP(), "pop"), BASIC_POP())
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	367 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	368 #define PUSH(v) BASIC_PUSH(v)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	369 #define POP() BASIC_POP()
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	370 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	371
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	372 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	373
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	374 #define GETLOCAL(i) (fastlocals[i])
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	375 #define SETLOCAL(i, value) do { Py_XDECREF(GETLOCAL(i)); \
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	376 GETLOCAL(i) = value; } while (0)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	377
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	378 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	379
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	380 if (tstate == NULL)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	381 Py_FatalError("eval_code2 called without a current thread");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	382
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	383 #ifdef USE_STACKCHECK
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	384 if (tstate->recursion_depth%10 == 0 && PyOS_CheckStack()) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	385 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	386 return NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	387 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	388 #endif
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	389
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	390 if (globals == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	391 PyErr_SetString(PyExc_SystemError, "eval_code2: NULL globals");
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	392 return NULL;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	393 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	394
1273 69a066b6b1ff (I suggest a recompile after getting this, the ceval.c bugfix may be crucial!) Guido van Rossum <guido@python.org> parents: 1271 diff changeset	395 #ifdef LLTRACE
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	396 lltrace = PyDict_GetItemString(globals, "__lltrace__") != NULL;
1273 69a066b6b1ff (I suggest a recompile after getting this, the ceval.c bugfix may be crucial!) Guido van Rossum <guido@python.org> parents: 1271 diff changeset	397 #endif
69a066b6b1ff (I suggest a recompile after getting this, the ceval.c bugfix may be crucial!) Guido van Rossum <guido@python.org> parents: 1271 diff changeset	398
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	399 f = PyFrame_New(
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	400 tstate, /back/
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	401 co, /code/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	402 globals, /globals/
5014 0bfac89afc83 Changes for frame object speedup: Guido van Rossum <guido@python.org> parents: 5002 diff changeset	403 locals); /locals/
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	404 if (f == NULL)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	405 return NULL;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	406
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	407 tstate->frame = f;
5052 7841c48cdb5b Two small changes: Guido van Rossum <guido@python.org> parents: 5050 diff changeset	408 fastlocals = f->f_localsplus;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	409
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	410 if (co->co_argcount > 0 \|\|
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	411 co->co_flags & (CO_VARARGS \| CO_VARKEYWORDS)) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	412 int i;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	413 int n = argcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	414 PyObject *kwdict = NULL;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	415 if (co->co_flags & CO_VARKEYWORDS) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	416 kwdict = PyDict_New();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	417 if (kwdict == NULL)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	418 goto fail;
5048 fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	419 i = co->co_argcount;
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	420 if (co->co_flags & CO_VARARGS)
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	421 i++;
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	422 SETLOCAL(i, kwdict);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	423 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	424 if (argcount > co->co_argcount) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	425 if (!(co->co_flags & CO_VARARGS)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	426 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	427 "too many arguments");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	428 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	429 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	430 n = co->co_argcount;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	431 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	432 for (i = 0; i < n; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	433 x = args[i];
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	434 Py_INCREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	435 SETLOCAL(i, x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	436 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	437 if (co->co_flags & CO_VARARGS) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	438 u = PyTuple_New(argcount - n);
5048 fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	439 if (u == NULL)
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	440 goto fail;
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	441 SETLOCAL(co->co_argcount, u);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	442 for (i = n; i < argcount; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	443 x = args[i];
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	444 Py_INCREF(x);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	445 PyTuple_SET_ITEM(u, i-n, x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	446 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	447 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	448 for (i = 0; i < kwcount; i++) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	449 PyObject keyword = kws[2i];
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	450 PyObject value = kws[2i + 1];
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	451 int j;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	452 /* XXX slow -- speed up using dictionary? */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	453 for (j = 0; j < co->co_argcount; j++) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	454 PyObject *nm = PyTuple_GET_ITEM(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	455 co->co_varnames, j);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	456 if (PyObject_Compare(keyword, nm) == 0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	457 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	458 }
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	459 /* Check errors from Compare */
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	460 if (PyErr_Occurred())
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	461 goto fail;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	462 if (j >= co->co_argcount) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	463 if (kwdict == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	464 PyErr_Format(PyExc_TypeError,
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	465 "unexpected keyword argument: %.400s",
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	466 PyString_AsString(keyword));
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	467 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	468 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	469 PyDict_SetItem(kwdict, keyword, value);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	470 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	471 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	472 if (GETLOCAL(j) != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	473 PyErr_SetString(PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	474 "keyword parameter redefined");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	475 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	476 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	477 Py_INCREF(value);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	478 SETLOCAL(j, value);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	479 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	480 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	481 if (argcount < co->co_argcount) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	482 int m = co->co_argcount - defcount;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	483 for (i = argcount; i < m; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	484 if (GETLOCAL(i) == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	485 PyErr_SetString(PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	486 "not enough arguments");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	487 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	488 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	489 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	490 if (n > m)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	491 i = n - m;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	492 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	493 i = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	494 for (; i < defcount; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	495 if (GETLOCAL(m+i) == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	496 PyObject *def = defs[i];
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	497 Py_INCREF(def);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	498 SETLOCAL(m+i, def);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	499 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	500 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	501 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	502 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	503 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	504 if (argcount > 0 \|\| kwcount > 0) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	505 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	506 "no arguments expected");
5048 fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	507 goto fail;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	508 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	509 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	510
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	511 if (tstate->sys_tracefunc != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	512 /* tstate->sys_tracefunc, if defined, is a function that
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	513 will be called on every entry to a code block.
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	514 Its return value, if not None, is a function that
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	515 will be called at the start of each executed line
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	516 of code. (Actually, the function must return
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	517 itself in order to continue tracing.)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	518 The trace functions are called with three arguments:
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	519 a pointer to the current frame, a string indicating
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	520 why the function is called, and an argument which
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	521 depends on the situation. The global trace function
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	522 (sys.trace) is also called whenever an exception
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	523 is detected. */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	524 if (call_trace(&tstate->sys_tracefunc,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	525 &f->f_trace, f, "call",
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	526 Py_None/XXX how to compute arguments now?/)) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	527 /* Trace function raised an error */
5048 fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	528 goto fail;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	529 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	530 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	531
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	532 if (tstate->sys_profilefunc != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	533 /* Similar for sys_profilefunc, except it needn't return
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	534 itself and isn't called for "line" events */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	535 if (call_trace(&tstate->sys_profilefunc,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	536 (PyObject**)0, f, "call",
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	537 Py_None/XXX/)) {
5048 fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	538 goto fail;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	539 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	540 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	541
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	542 if (++tstate->recursion_depth > MAX_RECURSION_DEPTH) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	543 --tstate->recursion_depth;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	544 PyErr_SetString(PyExc_RuntimeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	545 "Maximum recursion depth exceeded");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	546 tstate->frame = f->f_back;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	547 Py_DECREF(f);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	548 return NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	549 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	550
5052 7841c48cdb5b Two small changes: Guido van Rossum <guido@python.org> parents: 5050 diff changeset	551 next_instr = GETUSTRINGVALUE(co->co_code);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	552 stack_pointer = f->f_valuestack;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	553
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	554 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	555 err = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	556 x = Py_None; /* Not a reference, just anything non-NULL */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	557
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	558 for (;;) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	559 /* Do periodic things. Doing this every time through
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	560 the loop would add too much overhead, so we do it
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	561 only every Nth instruction. We also do it if
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	562 ``things_to_do'' is set, i.e. when an asynchronous
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	563 event needs attention (e.g. a signal handler or
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	564 async I/O handler); see Py_AddPendingCall() and
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	565 Py_MakePendingCalls() above. */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	566
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	567 if (things_to_do \|\| --tstate->ticker < 0) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	568 tstate->ticker = tstate->sys_checkinterval;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	569 if (things_to_do) {
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	570 if (Py_MakePendingCalls() < 0) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	571 why = WHY_EXCEPTION;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	572 goto on_error;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	573 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	574 }
5551 34509c05266f Logic for enabling mac-specific signal handling fixed (Jack) Guido van Rossum <guido@python.org> parents: 5492 diff changeset	575 #if !defined(HAVE_SIGNAL_H) \|\| defined(macintosh)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	576 /* If we have true signals, the signal handler
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	577 will call Py_AddPendingCall() so we don't
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	578 have to call sigcheck(). On the Mac and
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	579 DOS, alas, we have to call it. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	580 if (PyErr_CheckSignals()) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	581 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	582 goto on_error;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	583 }
5021 c22add364351 Only call sigcheck() at the ticker code if we don't have true signals. Guido van Rossum <guido@python.org> parents: 5018 diff changeset	584 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	585
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	586 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	587 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	588 /* Give another thread a chance */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	589
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	590 PyThreadState *tstate =
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	591 PyThreadState_Swap(NULL);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	592 release_lock(interpreter_lock);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	593
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	594 /* Other threads may run now */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	595
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	596 acquire_lock(interpreter_lock, 1);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	597 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	598 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	599 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	600 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	601
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	602 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	603
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	604 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	605 f->f_lasti = INSTR_OFFSET();
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	606 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	607
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	608 opcode = NEXTOP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	609 if (HAS_ARG(opcode))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	610 oparg = NEXTARG();
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	611 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	612 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	613 dxpairs[lastopcode][opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	614 lastopcode = opcode;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	615 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	616 dxp[opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	617 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	618
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	619 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	620 /* Instruction tracing */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	621
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	622 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	623 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	624 printf("%d: %d, %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	625 (int) (INSTR_OFFSET() - 3),
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	626 opcode, oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	627 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	628 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	629 printf("%d: %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	630 (int) (INSTR_OFFSET() - 1), opcode);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	631 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	632 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	633 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	634
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	635 /* Main switch on opcode */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	636
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	637 switch (opcode) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	638
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	639 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	640 It is essential that any operation that fails sets either
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	641 x to NULL, err to nonzero, or why to anything but WHY_NOT,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	642 and that no operation that succeeds does this! */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	643
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	644 /* case STOP_CODE: this is an error! */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	645
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	646 case POP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	647 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	648 Py_DECREF(v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	649 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	650
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	651 case ROT_TWO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	652 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	653 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	654 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	655 PUSH(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	656 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	657
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	658 case ROT_THREE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	659 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	660 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	661 x = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	662 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	663 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	664 PUSH(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	665 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	666
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	667 case DUP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	668 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	669 Py_INCREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	670 PUSH(v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	671 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	672
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	673 case UNARY_POSITIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	674 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	675 x = PyNumber_Positive(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	676 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	677 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	678 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	679 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	680
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	681 case UNARY_NEGATIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	682 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	683 x = PyNumber_Negative(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	684 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	685 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	686 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	687 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	688
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	689 case UNARY_NOT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	690 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	691 err = PyObject_IsTrue(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	692 Py_DECREF(v);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	693 if (err == 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	694 Py_INCREF(Py_True);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	695 PUSH(Py_True);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	696 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	697 }
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	698 else if (err > 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	699 Py_INCREF(Py_False);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	700 PUSH(Py_False);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	701 err = 0;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	702 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	703 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	704 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	705
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	706 case UNARY_CONVERT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	707 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	708 x = PyObject_Repr(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	709 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	710 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	711 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	712 break;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	713
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	714 case UNARY_INVERT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	715 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	716 x = PyNumber_Invert(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	717 Py_DECREF(v);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	718 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	719 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	720 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	721
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	722 case BINARY_POWER:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	723 w = POP();
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	724 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	725 x = PyNumber_Power(v, w, Py_None);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	726 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	727 Py_DECREF(w);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	728 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	729 if (x != NULL) continue;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	730 break;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	731
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	732 case BINARY_MULTIPLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	733 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	734 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	735 x = PyNumber_Multiply(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	736 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	737 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	738 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	739 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	740 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	741
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	742 case BINARY_DIVIDE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	743 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	744 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	745 x = PyNumber_Divide(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	746 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	747 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	748 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	749 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	750 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	751
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	752 case BINARY_MODULO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	753 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	754 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	755 x = PyNumber_Remainder(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	756 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	757 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	758 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	759 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	760 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	761
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	762 case BINARY_ADD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	763 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	764 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	765 x = PyNumber_Add(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	766 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	767 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	768 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	769 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	770 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	771
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	772 case BINARY_SUBTRACT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	773 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	774 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	775 x = PyNumber_Subtract(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	776 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	777 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	778 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	779 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	780 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	781
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	782 case BINARY_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	783 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	784 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	785 x = PyObject_GetItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	786 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	787 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	788 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	789 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	790 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	791
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	792 case BINARY_LSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	793 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	794 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	795 x = PyNumber_Lshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	796 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	797 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	798 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	799 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	800 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	801
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	802 case BINARY_RSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	803 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	804 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	805 x = PyNumber_Rshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	806 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	807 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	808 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	809 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	810 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	811
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	812 case BINARY_AND:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	813 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	814 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	815 x = PyNumber_And(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	816 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	817 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	818 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	819 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	820 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	821
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	822 case BINARY_XOR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	823 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	824 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	825 x = PyNumber_Xor(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	826 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	827 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	828 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	829 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	830 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	831
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	832 case BINARY_OR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	833 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	834 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	835 x = PyNumber_Or(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	836 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	837 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	838 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	839 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	840 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	841
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	842 case SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	843 case SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	844 case SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	845 case SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	846 if ((opcode-SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	847 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	848 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	849 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	850 if ((opcode-SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	851 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	852 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	853 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	854 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	855 x = apply_slice(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	856 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	857 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	858 Py_XDECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	859 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	860 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	861 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	862
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	863 case STORE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	864 case STORE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	865 case STORE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	866 case STORE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	867 if ((opcode-STORE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	868 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	869 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	870 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	871 if ((opcode-STORE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	872 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	873 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	874 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	875 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	876 t = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	877 err = assign_slice(u, v, w, t); /* u[v:w] = t */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	878 Py_DECREF(t);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	879 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	880 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	881 Py_XDECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	882 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	883 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	884
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	885 case DELETE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	886 case DELETE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	887 case DELETE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	888 case DELETE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	889 if ((opcode-DELETE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	890 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	891 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	892 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	893 if ((opcode-DELETE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	894 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	895 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	896 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	897 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	898 err = assign_slice(u, v, w, (PyObject *)NULL);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	899 /* del u[v:w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	900 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	901 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	902 Py_XDECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	903 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	904 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	905
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	906 case STORE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	907 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	908 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	909 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	910 /* v[w] = u */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	911 err = PyObject_SetItem(v, w, u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	912 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	913 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	914 Py_DECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	915 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	916 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	917
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	918 case DELETE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	919 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	920 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	921 /* del v[w] */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	922 err = PyObject_DelItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	923 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	924 Py_DECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	925 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	926 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	927
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	928 case PRINT_EXPR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	929 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	930 /* Print value except if procedure result */
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	931 /* Before printing, also assign to '_' */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	932 if (v != Py_None &&
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	933 (err = PyDict_SetItemString(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	934 f->f_builtins, "_", v)) == 0 &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	935 !Py_SuppressPrintingFlag) {
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	936 err = Py_FlushLine();
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	937 if (err == NULL) {
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	938 x = PySys_GetObject("stdout");
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	939 if (x == NULL)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	940 err = -1;
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	941 }
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	942 if (err == 0)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	943 err = PyFile_WriteObject(v, x, 0);
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	944 if (err == 0) {
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	945 PyFile_SoftSpace(x, 1);
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	946 err = Py_FlushLine();
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	947 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	948 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	949 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	950 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	951
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	952 case PRINT_ITEM:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	953 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	954 w = PySys_GetObject("stdout");
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	955 if (PyFile_SoftSpace(w, 1))
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	956 err = PyFile_WriteString(" ", w);
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	957 if (err == 0)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	958 err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	959 if (err == 0 && PyString_Check(v)) {
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	960 /* XXX move into writeobject() ? */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	961 char *s = PyString_AsString(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	962 int len = PyString_Size(v);
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2295 diff changeset	963 if (len > 0 &&
07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2295 diff changeset	964 isspace(Py_CHARMASK(s[len-1])) &&
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	965 s[len-1] != ' ')
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	966 PyFile_SoftSpace(w, 0);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	967 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	968 Py_DECREF(v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	969 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	970 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	971
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	972 case PRINT_NEWLINE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	973 x = PySys_GetObject("stdout");
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1016 diff changeset	974 if (x == NULL)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	975 PyErr_SetString(PyExc_RuntimeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	976 "lost sys.stdout");
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1016 diff changeset	977 else {
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	978 err = PyFile_WriteString("\n", x);
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	979 if (err == 0)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	980 PyFile_SoftSpace(x, 0);
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1016 diff changeset	981 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	982 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	983
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	984 case BREAK_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	985 why = WHY_BREAK;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	986 break;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	987
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	988 case RAISE_VARARGS:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	989 u = v = w = NULL;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	990 switch (oparg) {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	991 case 3:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	992 u = POP(); /* traceback */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	993 /* Fallthrough */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	994 case 2:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	995 v = POP(); /* value */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	996 /* Fallthrough */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	997 case 1:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	998 w = POP(); /* exc */
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	999 why = do_raise(w, v, u);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1000 break;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1001 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1002 PyErr_SetString(PyExc_SystemError,
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1003 "bad RAISE_VARARGS oparg");
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1004 why = WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1005 break;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1006 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1007 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1008
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1009 case LOAD_LOCALS:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1010 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1011 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1012 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1013 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1014 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1015 Py_INCREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1016 PUSH(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1017 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1018
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1019 case RETURN_VALUE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1020 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1021 why = WHY_RETURN;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1022 break;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1023
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1024 case EXEC_STMT:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1025 w = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1026 v = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1027 u = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1028 err = exec_statement(f, u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1029 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1030 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1031 Py_DECREF(w);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1032 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1033
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1034 case POP_BLOCK:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1035 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1036 PyTryBlock *b = PyFrame_BlockPop(f);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1037 while (STACK_LEVEL() > b->b_level) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1038 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1039 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1040 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1041 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1042 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1043
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1044 case END_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1045 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1046 if (PyInt_Check(v)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1047 why = (enum why_code) PyInt_AsLong(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1048 if (why == WHY_RETURN)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1049 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1050 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1051 else if (PyString_Check(v) \|\| PyClass_Check(v)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1052 w = POP();
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1053 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1054 PyErr_Restore(v, w, u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1055 why = WHY_RERAISE;
2872 d3b07ba3e12d fix bogus DECREF in finally clause Guido van Rossum <guido@python.org> parents: 2866 diff changeset	1056 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1057 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1058 else if (v != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1059 PyErr_SetString(PyExc_SystemError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1060 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1061 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1062 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1063 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1064 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1065
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1066 case BUILD_CLASS:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1067 u = POP();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1068 v = POP();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1069 w = POP();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1070 x = build_class(u, v, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1071 PUSH(x);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1072 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1073 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1074 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1075 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1076
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1077 case STORE_NAME:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1078 w = GETNAMEV(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1079 v = POP();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1080 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1081 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1082 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1083 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1084 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1085 err = PyDict_SetItem(x, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1086 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1087 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1088
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1089 case DELETE_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1090 w = GETNAMEV(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1091 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1092 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1093 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1094 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1095 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1096 if ((err = PyDict_DelItem(x, w)) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1097 PyErr_SetObject(PyExc_NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1098 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1099
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1100 #ifdef CASE_TOO_BIG
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1101 default: switch (opcode) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1102 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1103
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1104 case UNPACK_TUPLE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1105 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1106 if (!PyTuple_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1107 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1108 "unpack non-tuple");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1109 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1110 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1111 else if (PyTuple_Size(v) != oparg) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1112 PyErr_SetString(PyExc_ValueError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1113 "unpack tuple of wrong size");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1114 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1115 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1116 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1117 for (; --oparg >= 0; ) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1118 w = PyTuple_GET_ITEM(v, oparg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1119 Py_INCREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1120 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1121 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1122 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1123 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1124 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1125
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1126 case UNPACK_LIST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1127 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1128 if (!PyList_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1129 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1130 "unpack non-list");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1131 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1132 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1133 else if (PyList_Size(v) != oparg) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1134 PyErr_SetString(PyExc_ValueError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1135 "unpack list of wrong size");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1136 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1137 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1138 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1139 for (; --oparg >= 0; ) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1140 w = PyList_GetItem(v, oparg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1141 Py_INCREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1142 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1143 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1144 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1145 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1146 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1147
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1148 case STORE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1149 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1150 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1151 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1152 err = PyObject_SetAttr(v, w, u); /* v.w = u */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1153 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1154 Py_DECREF(u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1155 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1156
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1157 case DELETE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1158 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1159 v = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1160 err = PyObject_SetAttr(v, w, (PyObject *)NULL);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1161 /* del v.w */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1162 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1163 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1164
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1165 case STORE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1166 w = GETNAMEV(oparg);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1167 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1168 err = PyDict_SetItem(f->f_globals, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1169 Py_DECREF(v);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1170 break;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1171
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1172 case DELETE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1173 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1174 if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1175 PyErr_SetObject(PyExc_NameError, w);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1176 break;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1177
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1178 case LOAD_CONST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1179 x = GETCONST(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1180 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1181 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1182 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1183
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1184 case LOAD_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1185 w = GETNAMEV(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1186 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1187 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1188 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1189 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1190 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1191 x = PyDict_GetItem(x, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1192 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1193 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1194 x = PyDict_GetItem(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1195 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1196 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1197 x = PyDict_GetItem(f->f_builtins, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1198 if (x == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1199 PyErr_SetObject(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1200 PyExc_NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1201 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1202 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1203 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1204 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1205 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1206 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1207 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1208
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1209 case LOAD_GLOBAL:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1210 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1211 x = PyDict_GetItem(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1212 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1213 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1214 x = PyDict_GetItem(f->f_builtins, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1215 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1216 PyErr_SetObject(PyExc_NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1217 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1218 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1219 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1220 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1221 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1222 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1223
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1224 case LOAD_FAST:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1225 x = GETLOCAL(oparg);
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1226 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1227 PyErr_SetObject(PyExc_NameError,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1228 PyTuple_GetItem(co->co_varnames,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1229 oparg));
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1230 break;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1231 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1232 Py_INCREF(x);
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1233 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1234 if (x != NULL) continue;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1235 break;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1236
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1237 case STORE_FAST:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1238 v = POP();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1239 SETLOCAL(oparg, v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1240 continue;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1241
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1242 case DELETE_FAST:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1243 SETLOCAL(oparg, NULL);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1244 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1245
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1246 case BUILD_TUPLE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1247 x = PyTuple_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1248 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1249 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1250 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1251 PyTuple_SET_ITEM(x, oparg, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1252 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1253 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1254 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1255 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1256 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1257
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1258 case BUILD_LIST:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1259 x = PyList_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1260 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1261 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1262 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1263 err = PyList_SetItem(x, oparg, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1264 if (err != 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1265 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1266 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1267 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1268 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1269 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1270 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1271
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1272 case BUILD_MAP:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1273 x = PyDict_New();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1274 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1275 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1276 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1277
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1278 case LOAD_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1279 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1280 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1281 x = PyObject_GetAttr(v, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1282 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1283 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1284 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1285 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1286
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1287 case COMPARE_OP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1288 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1289 v = POP();
802 3d6541a2eca5 Arg of cmp_outcome becomes an int for portability to the Mac Guido van Rossum <guido@python.org> parents: 789 diff changeset	1290 x = cmp_outcome(oparg, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1291 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1292 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1293 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1294 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1295 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1296
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1297 case IMPORT_NAME:
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1298 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1299 x = PyDict_GetItemString(f->f_builtins, "__import__");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1300 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1301 PyErr_SetString(PyExc_ImportError,
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1302 "__import__ not found");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1303 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1304 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1305 if (PyCFunction_Check(x)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1306 u = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1307 Py_INCREF(u);
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1308 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1309 else {
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1310 u = find_from_args(f, INSTR_OFFSET());
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1311 if (u == NULL) {
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1312 x = u;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1313 break;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1314 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1315 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1316 w = Py_BuildValue("(OOOO)",
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1317 w,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1318 f->f_globals,
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1319 f->f_locals == NULL ?
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1320 Py_None : f->f_locals,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1321 u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1322 Py_DECREF(u);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1323 if (w == NULL) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1324 x = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1325 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1326 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1327 x = PyEval_CallObject(x, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1328 Py_DECREF(w);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1329 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1330 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1331 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1332
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1333 case IMPORT_FROM:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1334 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1335 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1336 PyFrame_FastToLocals(f);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1337 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1338 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1339 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1340 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1341 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1342 err = import_from(x, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1343 PyFrame_LocalsToFast(f, 0);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1344 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1345 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1346
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1347 case JUMP_FORWARD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1348 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1349 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1350
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1351 case JUMP_IF_FALSE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1352 err = PyObject_IsTrue(TOP());
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1353 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1354 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1355 else if (err == 0)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1356 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1357 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1358 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1359 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1360
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1361 case JUMP_IF_TRUE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1362 err = PyObject_IsTrue(TOP());
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1363 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1364 err = 0;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1365 JUMPBY(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1366 }
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1367 else if (err == 0)
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1368 ;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1369 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1370 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1371 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1372
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1373 case JUMP_ABSOLUTE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1374 JUMPTO(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1375 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1376
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1377 case FOR_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1378 /* for v in s: ...
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1379 On entry: stack contains s, i.
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1380 On exit: stack contains s, i+1, s[i];
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1381 but if loop exhausted:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1382 s, i are popped, and we jump */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1383 w = POP(); /* Loop index */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1384 v = POP(); /* Sequence object */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1385 u = loop_subscript(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1386 if (u != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1387 PUSH(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1388 x = PyInt_FromLong(PyInt_AsLong(w)+1);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1389 PUSH(x);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1390 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1391 PUSH(u);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1392 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1393 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1394 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1395 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1396 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1397 /* A NULL can mean "s exhausted"
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1398 but also an error: */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1399 if (PyErr_Occurred())
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1400 why = WHY_EXCEPTION;
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1401 else {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1402 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1403 continue;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1404 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1405 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1406 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1407
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1408 case SETUP_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1409 case SETUP_EXCEPT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1410 case SETUP_FINALLY:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1411 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1412 STACK_LEVEL());
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1413 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1414
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1415 case SET_LINENO:
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1416 #ifdef LLTRACE
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1417 if (lltrace)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1418 printf("--- %s:%d \n", filename, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1419 #endif
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1420 f->f_lineno = oparg;
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1421 if (f->f_trace == NULL)
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1422 continue;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1423 /* Trace each line of code reached */
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1424 f->f_lasti = INSTR_OFFSET();
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1425 err = call_trace(&f->f_trace, &f->f_trace,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1426 f, "line", Py_None);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1427 break;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1428
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1429 case CALL_FUNCTION:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1430 {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1431 int na = oparg & 0xff;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1432 int nk = (oparg>>8) & 0xff;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1433 int n = na + 2*nk;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1434 PyObject **pfunc = stack_pointer - n - 1;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1435 PyObject func = pfunc;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1436 PyObject *self = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1437 PyObject *class = NULL;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1438 f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1439 if (PyMethod_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1440 self = PyMethod_Self(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1441 class = PyMethod_Class(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1442 func = PyMethod_Function(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1443 Py_INCREF(func);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1444 if (self != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1445 Py_INCREF(self);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1446 Py_DECREF(*pfunc);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1447 *pfunc = self;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1448 na++;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1449 n++;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1450 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1451 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1452 /* Unbound methods must be
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1453 called with an instance of
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1454 the class (or a derived
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1455 class) as first argument */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1456 if (na > 0 &&
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1457 (self = stack_pointer[-n])
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1458 != NULL &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1459 PyInstance_Check(self) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1460 PyClass_IsSubclass(
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1461 (PyObject *)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1462 (((PyInstanceObject *)self)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1463 ->in_class),
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1464 class))
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1465 /* Handy-dandy */ ;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1466 else {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1467 PyErr_SetString(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1468 PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1469 "unbound method must be called with class instance 1st argument");
3294 2bddfb3cfcf1 don't return from main loop when error occurs Guido van Rossum <guido@python.org> parents: 3099 diff changeset	1470 x = NULL;
2bddfb3cfcf1 don't return from main loop when error occurs Guido van Rossum <guido@python.org> parents: 3099 diff changeset	1471 break;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1472 }
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1473 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1474 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1475 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1476 Py_INCREF(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1477 if (PyFunction_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1478 PyObject *co = PyFunction_GetCode(func);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1479 PyObject *globals =
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1480 PyFunction_GetGlobals(func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1481 PyObject *argdefs =
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1482 PyFunction_GetDefaults(func);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1483 PyObject **d;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1484 int nd;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1485 if (argdefs != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1486 d = &PyTuple_GET_ITEM(argdefs, 0);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1487 nd = ((PyTupleObject *)argdefs) ->
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1488 ob_size;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1489 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1490 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1491 d = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1492 nd = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1493 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1494 x = eval_code2(
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1495 (PyCodeObject *)co,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1496 globals, (PyObject *)NULL,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1497 stack_pointer-n, na,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1498 stack_pointer-2*nk, nk,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1499 d, nd,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1500 class);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1501 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1502 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1503 PyObject *args = PyTuple_New(na);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1504 PyObject *kwdict = NULL;
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1505 if (args == NULL) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1506 x = NULL;
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1507 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1508 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1509 if (nk > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1510 kwdict = PyDict_New();
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1511 if (kwdict == NULL) {
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1512 x = NULL;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1513 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1514 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1515 err = 0;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1516 while (--nk >= 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1517 PyObject *value = POP();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1518 PyObject *key = POP();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1519 err = PyDict_SetItem(
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1520 kwdict, key, value);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1521 Py_DECREF(key);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1522 Py_DECREF(value);
5050 8579e3441d9b Plug a leak with calling something other than a function or method is Guido van Rossum <guido@python.org> parents: 5049 diff changeset	1523 if (err)
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1524 break;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1525 }
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1526 if (err) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1527 Py_DECREF(args);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1528 Py_DECREF(kwdict);
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1529 break;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1530 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1531 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1532 while (--na >= 0) {
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1533 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1534 PyTuple_SET_ITEM(args, na, w);
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1535 }
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1536 x = PyEval_CallObjectWithKeywords(
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1537 func, args, kwdict);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1538 Py_DECREF(args);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1539 Py_XDECREF(kwdict);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1540 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1541 Py_DECREF(func);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1542 while (stack_pointer > pfunc) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1543 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1544 Py_DECREF(w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1545 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1546 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1547 if (x != NULL) continue;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1548 break;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1549 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1550
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1551 case MAKE_FUNCTION:
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1552 v = POP(); /* code object */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1553 x = PyFunction_New(v, f->f_globals);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1554 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1555 /* XXX Maybe this should be a separate opcode? */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1556 if (x != NULL && oparg > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1557 v = PyTuple_New(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1558 if (v == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1559 Py_DECREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1560 x = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1561 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1562 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1563 while (--oparg >= 0) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1564 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1565 PyTuple_SET_ITEM(v, oparg, w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1566 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1567 err = PyFunction_SetDefaults(x, v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1568 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1569 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1570 PUSH(x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1571 break;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1572
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1573 case BUILD_SLICE:
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1574 if (oparg == 3)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1575 w = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1576 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1577 w = NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1578 v = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1579 u = POP();
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	1580 x = PySlice_New(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1581 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1582 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1583 Py_XDECREF(w);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1584 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1585 if (x != NULL) continue;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1586 break;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1587
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1588
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1589 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1590 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1591 "XXX lineno: %d, opcode: %d\n",
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1592 f->f_lineno, opcode);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1593 PyErr_SetString(PyExc_SystemError, "unknown opcode");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1594 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1595 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1596
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1597 #ifdef CASE_TOO_BIG
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1598 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1599 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1600
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1601 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1602
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1603 on_error:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1604
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1605 /* Quickly continue if no error occurred */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1606
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1607 if (why == WHY_NOT) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1608 if (err == 0 && x != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1609 #ifdef CHECKEXC
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1610 if (PyErr_Occurred())
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1611 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1612 "XXX undetected error\n");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1613 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1614 #endif
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1615 continue; /* Normal, fast path */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1616 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1617 why = WHY_EXCEPTION;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1618 x = Py_None;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1619 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1620 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1621
814 f08d34499269 reverse sense of test for CHECKEXC Guido van Rossum <guido@python.org> parents: 802 diff changeset	1622 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1623 /* Double-check exception status */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1624
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1625 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1626 if (!PyErr_Occurred()) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1627 fprintf(stderr, "XXX ghost error\n");
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1628 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1629 "ghost error");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1630 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1631 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1632 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1633 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1634 if (PyErr_Occurred()) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1635 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1636 "XXX undetected error (why=%d)\n",
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1637 why);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1638 why = WHY_EXCEPTION;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1639 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1640 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1641 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1642
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1643 /* Log traceback info if this is a real exception */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1644
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1645 if (why == WHY_EXCEPTION) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1646 f->f_lasti = INSTR_OFFSET() - 1;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1647 if (HAS_ARG(opcode))
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1648 f->f_lasti -= 2;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1649 PyTraceBack_Here(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1650
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1651 if (f->f_trace)
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1652 call_exc_trace(&f->f_trace, &f->f_trace, f);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1653 if (tstate->sys_profilefunc)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1654 call_exc_trace(&tstate->sys_profilefunc,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1655 (PyObject**)0, f);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1656 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1657
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1658 /* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1659
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1660 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1661 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1662
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1663 /* Unwind stacks if a (pseudo) exception occurred */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1664
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1665 while (why != WHY_NOT && f->f_iblock > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1666 PyTryBlock *b = PyFrame_BlockPop(f);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1667 while (STACK_LEVEL() > b->b_level) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1668 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1669 Py_XDECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1670 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1671 if (b->b_type == SETUP_LOOP && why == WHY_BREAK) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1672 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1673 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1674 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1675 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1676 if (b->b_type == SETUP_FINALLY \|\|
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1677 (b->b_type == SETUP_EXCEPT &&
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1678 why == WHY_EXCEPTION)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1679 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1680 PyObject exc, val, *tb;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1681 PyErr_Fetch(&exc, &val, &tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1682 if (val == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1683 val = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1684 Py_INCREF(val);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1685 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1686 /* Make the raw exception data
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1687 available to the handler,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1688 so a program can emulate the
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1689 Python main loop. Don't do
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1690 this for 'finally'. */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1691 if (b->b_type == SETUP_EXCEPT) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1692 set_exc_info(tstate,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1693 exc, val, tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1694 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1695 PUSH(tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1696 PUSH(val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1697 PUSH(exc);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1698 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1699 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1700 if (why == WHY_RETURN)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1701 PUSH(retval);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1702 v = PyInt_FromLong((long)why);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1703 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1704 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1705 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1706 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1707 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1708 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1709 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1710
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1711 /* End the loop if we still have an error (or return) */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1712
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1713 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1714 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1715
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1716 } /* main loop */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1717
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1718 /* Pop remaining stack entries */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1719
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1720 while (!EMPTY()) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1721 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1722 Py_XDECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1723 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1724
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1725 if (why != WHY_RETURN)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1726 retval = NULL;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1727
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1728 if (f->f_trace) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1729 if (why == WHY_RETURN) {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1730 if (call_trace(&f->f_trace, &f->f_trace, f,
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1731 "return", retval)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1732 Py_XDECREF(retval);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1733 retval = NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1734 why = WHY_EXCEPTION;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1735 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1736 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1737 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1738
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1739 if (tstate->sys_profilefunc && why == WHY_RETURN) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1740 if (call_trace(&tstate->sys_profilefunc, (PyObject**)0,
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1741 f, "return", retval)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1742 Py_XDECREF(retval);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1743 retval = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1744 why = WHY_EXCEPTION;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1745 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1746 }
5023 75c1ee882a4a Kill all local variables on function return. This closes a gigantic Guido van Rossum <guido@python.org> parents: 5021 diff changeset	1747
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1748 reset_exc_info(tstate);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1749
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1750 --tstate->recursion_depth;
5048 fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	1751
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	1752 fail: /* Jump here from prelude on failure */
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1753
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1754 /* Restore previous frame and release the current one */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1755
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1756 tstate->frame = f->f_back;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1757 Py_DECREF(f);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1758
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1759 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1760 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1761
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1762 static void
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1763 set_exc_info(tstate, type, value, tb)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1764 PyThreadState *tstate;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1765 PyObject *type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1766 PyObject *value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1767 PyObject *tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1768 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1769 PyFrameObject *frame;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1770 PyObject tmp_type, tmp_value, *tmp_tb;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1771 frame = tstate->frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1772 if (frame->f_exc_type == NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1773 /* This frame didn't catch an exception before */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1774 /* Save previous exception of this thread in this frame */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1775 if (tstate->exc_type == NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1776 Py_INCREF(Py_None);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1777 tstate->exc_type = Py_None;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1778 }
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1779 tmp_type = frame->f_exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1780 tmp_value = frame->f_exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1781 tmp_tb = frame->f_exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1782 Py_XINCREF(tstate->exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1783 Py_XINCREF(tstate->exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1784 Py_XINCREF(tstate->exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1785 frame->f_exc_type = tstate->exc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1786 frame->f_exc_value = tstate->exc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1787 frame->f_exc_traceback = tstate->exc_traceback;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1788 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1789 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1790 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1791 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1792 /* Set new exception for this thread */
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1793 tmp_type = tstate->exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1794 tmp_value = tstate->exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1795 tmp_tb = tstate->exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1796 Py_XINCREF(type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1797 Py_XINCREF(value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1798 Py_XINCREF(tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1799 tstate->exc_type = type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1800 tstate->exc_value = value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1801 tstate->exc_traceback = tb;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1802 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1803 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1804 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1805 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1806 PySys_SetObject("exc_type", type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1807 PySys_SetObject("exc_value", value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1808 PySys_SetObject("exc_traceback", tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1809 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1810
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1811 static void
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1812 reset_exc_info(tstate)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1813 PyThreadState *tstate;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1814 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1815 PyFrameObject *frame;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1816 PyObject tmp_type, tmp_value, *tmp_tb;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1817 frame = tstate->frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1818 if (frame->f_exc_type != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1819 /* This frame caught an exception */
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1820 tmp_type = tstate->exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1821 tmp_value = tstate->exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1822 tmp_tb = tstate->exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1823 Py_XINCREF(frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1824 Py_XINCREF(frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1825 Py_XINCREF(frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1826 tstate->exc_type = frame->f_exc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1827 tstate->exc_value = frame->f_exc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1828 tstate->exc_traceback = frame->f_exc_traceback;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1829 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1830 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1831 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1832 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1833 PySys_SetObject("exc_type", frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1834 PySys_SetObject("exc_value", frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1835 PySys_SetObject("exc_traceback", frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1836 }
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1837 tmp_type = frame->f_exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1838 tmp_value = frame->f_exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1839 tmp_tb = frame->f_exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1840 frame->f_exc_type = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1841 frame->f_exc_value = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1842 frame->f_exc_traceback = NULL;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1843 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1844 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	1845 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1846 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1847
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1848 /* Logic for the raise statement (too complicated for inlining).
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1849 This consumes a reference count to each of its arguments. */
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	1850 static enum why_code
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1851 do_raise(type, value, tb)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1852 PyObject type, value, *tb;
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1853 {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1854 /* We support the following forms of raise:
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1855 raise <class>, <classinstance>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1856 raise <class>, <argument tuple>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1857 raise <class>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1858 raise <class>, <argument>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1859 raise <classinstance>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1860 raise <string>, <object>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1861 raise <string>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1862
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1863 An omitted second argument is the same as None.
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1864
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1865 In addition, raise <tuple>, <anything> is the same as
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1866 raising the tuple's first item (and it better have one!);
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1867 this rule is applied recursively.
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1868
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1869 Finally, an optional third argument can be supplied, which
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1870 gives the traceback to be substituted (useful when
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1871 re-raising an exception after examining it). */
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1872
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1873 /* First, check the traceback argument, replacing None with
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1874 NULL. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1875 if (tb == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1876 Py_DECREF(tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1877 tb = NULL;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1878 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1879 else if (tb != NULL && !PyTraceBack_Check(tb)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1880 PyErr_SetString(PyExc_TypeError,
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1881 "raise 3rd arg must be traceback or None");
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1882 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1883 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1884
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1885 /* Next, replace a missing value with None */
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1886 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1887 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1888 Py_INCREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1889 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1890
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1891 /* Next, repeatedly, replace a tuple exception with its first item */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1892 while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1893 PyObject *tmp = type;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1894 type = PyTuple_GET_ITEM(type, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1895 Py_INCREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1896 Py_DECREF(tmp);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1897 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1898
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1899 /* Now switch on the exception's type */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1900 if (PyString_Check(type)) {
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1901 ;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1902 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1903 else if (PyClass_Check(type)) {
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1904 /* Raising a class. If the value is an instance, it
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1905 better be an instance of the class. If it is not,
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1906 it will be used to create an instance. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1907 if (PyInstance_Check(value)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1908 PyObject inclass = (PyObject)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1909 (((PyInstanceObject*)value)->in_class);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1910 if (!PyClass_IsSubclass(inclass, type)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1911 PyErr_SetString(PyExc_TypeError,
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1912 "raise <class>, <instance> requires that <instance> is a member of <class>");
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1913 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1914 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1915 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1916 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1917 /* Go instantiate the class */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1918 PyObject args, res;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1919 if (value == Py_None)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1920 args = Py_BuildValue("()");
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1921 else if (PyTuple_Check(value)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1922 Py_INCREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1923 args = value;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1924 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1925 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1926 args = Py_BuildValue("(O)", value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1927 if (args == NULL)
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1928 goto raise_error;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1929 res = PyEval_CallObject(type, args);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1930 Py_DECREF(args);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1931 if (res == NULL)
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1932 goto raise_error;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1933 Py_DECREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1934 value = res;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1935 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1936 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1937 else if (PyInstance_Check(type)) {
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1938 /* Raising an instance. The value should be a dummy. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1939 if (value != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1940 PyErr_SetString(PyExc_TypeError,
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1941 "instance exception may not have a separate value");
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1942 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1943 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1944 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1945 /* Normalize to raise <class>, <instance> */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1946 Py_DECREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1947 value = type;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1948 type = (PyObject) ((PyInstanceObject)type)->in_class;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1949 Py_INCREF(type);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1950 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1951 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1952 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1953 /* Not something you can raise. You get an exception
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1954 anyway, just not what you specified :-) */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1955 PyErr_SetString(PyExc_TypeError,
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1956 "exceptions must be strings, classes, or instances");
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1957 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1958 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1959 PyErr_Restore(type, value, tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1960 if (tb == NULL)
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1961 return WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1962 else
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1963 return WHY_RERAISE;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1964 raise_error:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1965 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1966 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1967 Py_XDECREF(tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1968 return WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1969 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1970
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1971 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1972 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1973 prtrace(v, str)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1974 PyObject *v;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1975 char *str;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1976 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1977 printf("%s ", str);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1978 if (PyObject_Print(v, stdout, 0) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1979 PyErr_Clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1980 printf("\n");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1981 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1982 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1983
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1984 static void
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1985 call_exc_trace(p_trace, p_newtrace, f)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1986 PyObject p_trace, p_newtrace;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1987 PyFrameObject *f;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1988 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1989 PyObject type, value, traceback, arg;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1990 int err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1991 PyErr_Fetch(&type, &value, &traceback);
815 6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	1992 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1993 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1994 Py_INCREF(value);
815 6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	1995 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1996 arg = Py_BuildValue("(OOO)", type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1997 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1998 PyErr_Restore(type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1999 return;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2000 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2001 err = call_trace(p_trace, p_newtrace, f, "exception", arg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2002 Py_DECREF(arg);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2003 if (err == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2004 PyErr_Restore(type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2005 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2006 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2007 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2008 Py_XDECREF(traceback);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2009 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2010 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2011
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2012 static int
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2013 call_trace(p_trace, p_newtrace, f, msg, arg)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2014 PyObject *p_trace; / in/out; may not be NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2015 may not point to NULL variable initially */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2016 PyObject *p_newtrace; / in/out; may be NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2017 may point to NULL variable;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2018 may be same variable as p_newtrace */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2019 PyFrameObject *f;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2020 char *msg;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2021 PyObject *arg;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2022 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2023 PyThreadState *tstate = f->f_tstate;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2024 PyObject args, what;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2025 PyObject *res = NULL;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2026
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2027 if (tstate->tracing) {
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2028 /* Don't do recursive traces */
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2029 if (p_newtrace) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2030 Py_XDECREF(*p_newtrace);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2031 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2032 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2033 return 0;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2034 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2035
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2036 args = PyTuple_New(3);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	2037 if (args == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2038 goto Py_Cleanup;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2039 what = PyString_FromString(msg);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2040 if (what == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2041 goto Py_Cleanup;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2042 Py_INCREF(f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2043 PyTuple_SET_ITEM(args, 0, (PyObject *)f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2044 PyTuple_SET_ITEM(args, 1, what);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2045 if (arg == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2046 arg = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2047 Py_INCREF(arg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2048 PyTuple_SET_ITEM(args, 2, arg);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2049 tstate->tracing++;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2050 PyFrame_FastToLocals(f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2051 res = PyEval_CallObject(p_trace, args); / May clear p_trace! /
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2052 PyFrame_LocalsToFast(f, 1);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2053 tstate->tracing--;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2054 Py_Cleanup:
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2055 Py_XDECREF(args);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2056 if (res == NULL) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2057 /* The trace proc raised an exception */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2058 PyTraceBack_Here(f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2059 Py_XDECREF(*p_trace);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2060 *p_trace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2061 if (p_newtrace) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2062 Py_XDECREF(*p_newtrace);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2063 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2064 }
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	2065 return -1;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2066 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2067 else {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2068 if (p_newtrace) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2069 Py_XDECREF(*p_newtrace);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2070 if (res == Py_None)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2071 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2072 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2073 Py_INCREF(res);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2074 *p_newtrace = res;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2075 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2076 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2077 Py_DECREF(res);
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	2078 return 0;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2079 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2080 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2081
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2082 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2083 PyEval_GetBuiltins()
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2084 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2085 PyFrameObject *current_frame = PyThreadState_Get()->frame;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2086 if (current_frame == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2087 return PyBuiltin_GetModule();
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2088 else
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2089 return current_frame->f_builtins;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2090 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2091
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2092 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2093 PyEval_GetLocals()
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2094 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2095 PyFrameObject *current_frame = PyThreadState_Get()->frame;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2096 if (current_frame == NULL)
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2097 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2098 PyFrame_FastToLocals(current_frame);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2099 return current_frame->f_locals;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2100 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2101
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2102 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2103 PyEval_GetGlobals()
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2104 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2105 PyFrameObject *current_frame = PyThreadState_Get()->frame;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2106 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2107 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2108 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2109 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2110 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2111
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2112 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2113 PyEval_GetFrame()
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2114 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2115 PyFrameObject *current_frame = PyThreadState_Get()->frame;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2116 return (PyObject *)current_frame;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2117 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2118
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2119 int
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2120 PyEval_GetRestricted()
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2121 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2122 PyFrameObject *current_frame = PyThreadState_Get()->frame;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2123 return current_frame == NULL ? 0 : current_frame->f_restricted;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2124 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2125
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2126 int
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2127 Py_FlushLine()
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2128 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2129 PyObject *f = PySys_GetObject("stdout");
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2130 if (f == NULL)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2131 return 0;
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2132 if (!PyFile_SoftSpace(f, 0))
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2133 return 0;
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2134 return PyFile_WriteString("\n", f);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2135 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2136
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2137
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2138 /* External interface to call any callable object.
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2139 The arg must be a tuple or NULL. */
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2140
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2141 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2142 PyEval_CallObject(func, arg)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2143 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2144 PyObject *arg;
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2145 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2146 return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2147 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2148
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2149 PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2150 PyEval_CallObjectWithKeywords(func, arg, kw)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2151 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2152 PyObject *arg;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2153 PyObject *kw;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2154 {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2155 ternaryfunc call;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2156 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2157
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2158 if (arg == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2159 arg = PyTuple_New(0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2160 else if (!PyTuple_Check(arg)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2161 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2162 "argument list must be a tuple");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2163 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2164 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2165 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2166 Py_INCREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2167
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2168 if (kw != NULL && !PyDict_Check(kw)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2169 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2170 "keyword list must be a dictionary");
2894 4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	2171 return NULL;
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	2172 }
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	2173
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2174 if ((call = func->ob_type->tp_call) != NULL)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2175 result = (*call)(func, arg, kw);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2176 else if (PyMethod_Check(func) \|\| PyFunction_Check(func))
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2177 result = call_function(func, arg, kw);
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2178 else
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2179 result = call_builtin(func, arg, kw);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2180
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2181 Py_DECREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2182
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2183 if (result == NULL && !PyErr_Occurred())
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2184 PyErr_SetString(PyExc_SystemError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2185 "NULL result without error in call_object");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2186
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2187 return result;
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2188 }
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2189
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2190 static PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2191 call_builtin(func, arg, kw)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2192 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2193 PyObject *arg;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2194 PyObject *kw;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2195 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2196 if (PyCFunction_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2197 PyCFunction meth = PyCFunction_GetFunction(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2198 PyObject *self = PyCFunction_GetSelf(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2199 int flags = PyCFunction_GetFlags(func);
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2200 if (!(flags & METH_VARARGS)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2201 int size = PyTuple_Size(arg);
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2202 if (size == 1)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2203 arg = PyTuple_GET_ITEM(arg, 0);
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2204 else if (size == 0)
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2205 arg = NULL;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2206 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2207 if (flags & METH_KEYWORDS)
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2208 return (*(PyCFunctionWithKeywords)meth)(self, arg, kw);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2209 if (kw != NULL && PyDict_Size(kw) != 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2210 PyErr_SetString(PyExc_TypeError,
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2211 "this function takes no keyword arguments");
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2212 return NULL;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2213 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2214 return (*meth)(self, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2215 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2216 if (PyClass_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2217 return PyInstance_New(func, arg, kw);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2218 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2219 if (PyInstance_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2220 PyObject res, call = PyObject_GetAttrString(func,"__call__");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2221 if (call == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2222 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2223 PyErr_SetString(PyExc_AttributeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2224 "no __call__ method defined");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2225 return NULL;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2226 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2227 res = PyEval_CallObjectWithKeywords(call, arg, kw);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2228 Py_DECREF(call);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2229 return res;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2230 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2231 PyErr_SetString(PyExc_TypeError, "call of non-function");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2232 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2233 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2234
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2235 static PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2236 call_function(func, arg, kw)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2237 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2238 PyObject *arg;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2239 PyObject *kw;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2240 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2241 PyObject class = NULL; / == owner */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2242 PyObject *argdefs;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2243 PyObject d, k;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2244 int nk, nd;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2245 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2246
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2247 if (kw != NULL && !PyDict_Check(kw)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2248 PyErr_BadInternalCall();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2249 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2250 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2251
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2252 if (PyMethod_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2253 PyObject *self = PyMethod_Self(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2254 class = PyMethod_Class(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2255 func = PyMethod_Function(func);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2256 if (self == NULL) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2257 /* Unbound methods must be called with an instance of
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2258 the class (or a derived class) as first argument */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2259 if (PyTuple_Size(arg) >= 1) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2260 self = PyTuple_GET_ITEM(arg, 0);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2261 if (self != NULL &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2262 PyInstance_Check(self) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2263 PyClass_IsSubclass((PyObject *)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2264 (((PyInstanceObject *)self)->in_class),
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2265 class))
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2266 /* Handy-dandy */ ;
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2267 else
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2268 self = NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2269 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2270 if (self == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2271 PyErr_SetString(PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2272 "unbound method must be called with class instance 1st argument");
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2273 return NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2274 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2275 Py_INCREF(arg);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2276 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2277 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2278 int argcount = PyTuple_Size(arg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2279 PyObject *newarg = PyTuple_New(argcount + 1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2280 int i;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2281 if (newarg == NULL)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2282 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2283 Py_INCREF(self);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2284 PyTuple_SET_ITEM(newarg, 0, self);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2285 for (i = 0; i < argcount; i++) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2286 PyObject *v = PyTuple_GET_ITEM(arg, i);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2287 Py_XINCREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2288 PyTuple_SET_ITEM(newarg, i+1, v);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2289 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2290 arg = newarg;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2291 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2292 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2293 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2294 if (!PyFunction_Check(func)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2295 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2296 "call of non-function");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2297 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2298 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2299 Py_INCREF(arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2300 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2301
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2302 argdefs = PyFunction_GetDefaults(func);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2303 if (argdefs != NULL && PyTuple_Check(argdefs)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2304 d = &PyTuple_GET_ITEM((PyTupleObject *)argdefs, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2305 nd = PyTuple_Size(argdefs);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2306 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2307 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2308 d = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2309 nd = 0;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2310 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2311
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2312 if (kw != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2313 int pos, i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2314 nk = PyDict_Size(kw);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2315 k = PyMem_NEW(PyObject , 2nk);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2316 if (k == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2317 PyErr_NoMemory();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2318 Py_DECREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2319 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2320 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2321 pos = i = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2322 while (PyDict_Next(kw, &pos, &k[i], &k[i+1]))
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2323 i += 2;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2324 nk = i/2;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2325 /* XXX This is broken if the caller deletes dict items! */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2326 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2327 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2328 k = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2329 nk = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2330 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2331
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2332 result = eval_code2(
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2333 (PyCodeObject *)PyFunction_GetCode(func),
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2334 PyFunction_GetGlobals(func), (PyObject *)NULL,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2335 &PyTuple_GET_ITEM(arg, 0), PyTuple_Size(arg),
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2336 k, nk,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2337 d, nd,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2338 class);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2339
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2340 Py_DECREF(arg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2341 PyMem_XDEL(k);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2342
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2343 return result;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2344 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2345
3863 4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2346 #define SLICE_ERROR_MSG \
4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2347 "standard sequence type does not support step size other than one"
4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2348
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2349 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2350 loop_subscript(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2351 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2352 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2353 PySequenceMethods *sq = v->ob_type->tp_as_sequence;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2354 int i;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2355 if (sq == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2356 PyErr_SetString(PyExc_TypeError, "loop over non-sequence");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2357 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2358 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2359 i = PyInt_AsLong(w);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2360 v = (*sq->sq_item)(v, i);
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2361 if (v)
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2362 return v;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2363 if (PyErr_Occurred() == PyExc_IndexError)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2364 PyErr_Clear();
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2365 return NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2366 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2367
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2368 static int
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2369 slice_index(v, pi)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2370 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2371 int *pi;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2372 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2373 if (v != NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2374 long x;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2375 if (!PyInt_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2376 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2377 "slice index must be int");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2378 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2379 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2380 x = PyInt_AsLong(v);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2381 /* Truncate -- very long indices are truncated anyway */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2382 if (x > INT_MAX)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2383 x = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2384 else if (x < -INT_MAX)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2385 x = 0;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2386 *pi = x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2387 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2388 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2389 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2390
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2391 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2392 apply_slice(u, v, w) /* return u[v:w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2393 PyObject u, v, *w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2394 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2395 int ilow = 0, ihigh = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2396 if (slice_index(v, &ilow) != 0)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2397 return NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2398 if (slice_index(w, &ihigh) != 0)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2399 return NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2400 return PySequence_GetSlice(u, ilow, ihigh);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2401 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2402
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2403 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2404 assign_slice(u, v, w, x) /* u[v:w] = x */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2405 PyObject u, v, w, x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2406 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2407 int ilow = 0, ihigh = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2408 if (slice_index(v, &ilow) != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2409 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2410 if (slice_index(w, &ihigh) != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2411 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2412 if (x == NULL)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2413 return PySequence_DelSlice(u, ilow, ihigh);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2414 else
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2415 return PySequence_SetSlice(u, ilow, ihigh, x);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2416 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2417
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2418 static int
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2419 cmp_exception(err, v)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2420 PyObject err, v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2421 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2422 if (PyTuple_Check(v)) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2423 int i, n;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2424 n = PyTuple_Size(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2425 for (i = 0; i < n; i++) {
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	2426 /* Test recursively */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2427 if (cmp_exception(err, PyTuple_GET_ITEM(v, i)))
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2428 return 1;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2429 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2430 return 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2431 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2432 if (PyClass_Check(v) && PyClass_Check(err))
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2433 return PyClass_IsSubclass(err, v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2434 return err == v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2435 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2436
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2437 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2438 cmp_member(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2439 PyObject v, w;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2440 {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2441 int i, cmp;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2442 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2443 PySequenceMethods *sq;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2444 /* Special case for char in string */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2445 if (PyString_Check(w)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2446 register char s, end;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2447 register char c;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2448 if (!PyString_Check(v) \|\| PyString_Size(v) != 1) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2449 PyErr_SetString(PyExc_TypeError,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2450 "string member test needs char left operand");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2451 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2452 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2453 c = PyString_AsString(v)[0];
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2454 s = PyString_AsString(w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2455 end = s + PyString_Size(w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2456 while (s < end) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2457 if (c == *s++)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2458 return 1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2459 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2460 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2461 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2462 sq = w->ob_type->tp_as_sequence;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2463 if (sq == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2464 PyErr_SetString(PyExc_TypeError,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2465 "'in' or 'not in' needs sequence right argument");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2466 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2467 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2468 for (i = 0; ; i++) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2469 x = (*sq->sq_item)(w, i);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2470 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2471 if (PyErr_Occurred() == PyExc_IndexError) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2472 PyErr_Clear();
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2473 break;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2474 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2475 return -1;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2476 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2477 cmp = PyObject_Compare(v, x);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2478 Py_XDECREF(x);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2479 if (cmp == 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2480 return 1;
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	2481 if (PyErr_Occurred())
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	2482 return -1;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2483 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2484 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2485 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2486
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2487 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2488 cmp_outcome(op, v, w)
802 3d6541a2eca5 Arg of cmp_outcome becomes an int for portability to the Mac Guido van Rossum <guido@python.org> parents: 789 diff changeset	2489 int op;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2490 register PyObject *v;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2491 register PyObject *w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2492 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2493 register int cmp;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2494 register int res = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2495 switch (op) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2496 case IS:
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2497 case IS_NOT:
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2498 res = (v == w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2499 if (op == (int) IS_NOT)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2500 res = !res;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2501 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2502 case IN:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2503 case NOT_IN:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2504 res = cmp_member(v, w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2505 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2506 return NULL;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2507 if (op == (int) NOT_IN)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2508 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2509 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2510 case EXC_MATCH:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2511 res = cmp_exception(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2512 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2513 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2514 cmp = PyObject_Compare(v, w);
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	2515 if (cmp && PyErr_Occurred())
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5606 diff changeset	2516 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2517 switch (op) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2518 case LT: res = cmp < 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2519 case LE: res = cmp <= 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2520 case EQ: res = cmp == 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2521 case NE: res = cmp != 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2522 case GT: res = cmp > 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2523 case GE: res = cmp >= 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2524 /* XXX no default? (res is initialized to 0 though) */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2525 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2526 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2527 v = res ? Py_True : Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2528 Py_INCREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2529 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2530 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2531
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2532 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2533 import_from(locals, v, name)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2534 PyObject *locals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2535 PyObject *v;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2536 PyObject *name;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2537 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2538 PyObject w, x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2539 if (!PyModule_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2540 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2541 "import-from requires module object");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2542 return -1;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2543 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2544 w = PyModule_GetDict(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2545 if (PyString_AsString(name)[0] == '*') {
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2546 int pos, err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2547 PyObject name, value;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2548 pos = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2549 while (PyDict_Next(w, &pos, &name, &value)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2550 if (!PyString_Check(name) \|\|
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2551 PyString_AsString(name)[0] == '_')
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2552 continue;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2553 Py_INCREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2554 err = PyDict_SetItem(locals, name, value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2555 Py_DECREF(value);
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2556 if (err != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2557 return -1;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2558 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2559 return 0;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2560 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2561 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2562 x = PyDict_GetItem(w, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2563 if (x == NULL) {
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2564 char buf[250];
661 7e5f4d9aee77 Limit length of name passed to sprintf. Guido van Rossum <guido@python.org> parents: 607 diff changeset	2565 sprintf(buf, "cannot import name %.230s",
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2566 PyString_AsString(name));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2567 PyErr_SetString(PyExc_ImportError, buf);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2568 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2569 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2570 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2571 return PyDict_SetItem(locals, name, x);
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2572 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2573 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2574
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2575 static PyObject *
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2576 build_class(methods, bases, name)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2577 PyObject methods; / dictionary */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2578 PyObject bases; / tuple containing classes */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2579 PyObject name; / string */
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2580 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2581 int i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2582 if (!PyTuple_Check(bases)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2583 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2584 "build_class with non-tuple bases");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2585 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2586 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2587 if (!PyDict_Check(methods)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2588 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2589 "build_class with non-dictionary");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2590 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2591 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2592 if (!PyString_Check(name)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2593 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2594 "build_class witn non-string name");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2595 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2596 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2597 for (i = PyTuple_Size(bases); --i >= 0; ) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2598 PyObject *base = PyTuple_GET_ITEM(bases, i);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2599 if (!PyClass_Check(base)) {
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2600 /* Call the base's type, if it is callable.
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2601 This code is a hook for Donald Beaudry's
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2602 and Jim Fulton's type extensions. In
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2603 unexended Python it will never be triggered
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2604 since its types are not callable. */
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2605 if (base->ob_type->ob_type->tp_call) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2606 PyObject *args;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2607 PyObject *class;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2608 args = Py_BuildValue("(OOO)",
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2609 name, bases, methods);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2610 class = PyEval_CallObject(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2611 (PyObject *)base->ob_type, args);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2612 Py_DECREF(args);
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2613 return class;
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2614 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2615 PyErr_SetString(PyExc_TypeError,
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2616 "base is not a class object");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2617 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2618 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2619 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2620 return PyClass_New(bases, methods, name);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2621 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2622
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2623 static int
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2624 exec_statement(f, prog, globals, locals)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2625 PyFrameObject *f;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2626 PyObject *prog;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2627 PyObject *globals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2628 PyObject *locals;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2629 {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2630 char *s;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2631 int n;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2632 PyObject *v;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2633 int plain = 0;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2634
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2635 if (PyTuple_Check(prog) && globals == Py_None && locals == Py_None &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2636 ((n = PyTuple_Size(prog)) == 2 \|\| n == 3)) {
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2637 /* Backward compatibility hack */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2638 globals = PyTuple_GetItem(prog, 1);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2639 if (n == 3)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2640 locals = PyTuple_GetItem(prog, 2);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2641 prog = PyTuple_GetItem(prog, 0);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2642 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2643 if (globals == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2644 globals = PyEval_GetGlobals();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2645 if (locals == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2646 locals = PyEval_GetLocals();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2647 plain = 1;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2648 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2649 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2650 else if (locals == Py_None)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2651 locals = globals;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2652 if (!PyString_Check(prog) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2653 !PyCode_Check(prog) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2654 !PyFile_Check(prog)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2655 PyErr_SetString(PyExc_TypeError,
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2656 "exec 1st arg must be string, code or file object");
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2657 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2658 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2659 if (!PyDict_Check(globals) \|\| !PyDict_Check(locals)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2660 PyErr_SetString(PyExc_TypeError,
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2661 "exec 2nd/3rd args must be dict or None");
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2662 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2663 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2664 if (PyDict_GetItemString(globals, "__builtins__") == NULL)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2665 PyDict_SetItemString(globals, "__builtins__", f->f_builtins);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2666 if (PyCode_Check(prog)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2667 if (PyEval_EvalCode((PyCodeObject *) prog,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2668 globals, locals) == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2669 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2670 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2671 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2672 if (PyFile_Check(prog)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2673 FILE *fp = PyFile_AsFile(prog);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2674 char *name = PyString_AsString(PyFile_Name(prog));
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5413 diff changeset	2675 if (PyRun_File(fp, name, Py_file_input,
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5413 diff changeset	2676 globals, locals) == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2677 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2678 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2679 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2680 s = PyString_AsString(prog);
5492 af1aea6b968f (int) cast for strlen() to keep picky compilers happy. Guido van Rossum <guido@python.org> parents: 5438 diff changeset	2681 if ((int)strlen(s) != PyString_Size(prog)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2682 PyErr_SetString(PyExc_ValueError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2683 "embedded '\\0' in exec string");
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2684 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2685 }
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5413 diff changeset	2686 v = PyRun_String(s, Py_file_input, globals, locals);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2687 if (v == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2688 return -1;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2689 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2690 if (plain)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2691 PyFrame_LocalsToFast(f, 0);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2692 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2693 }
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2694
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	2695 /* Hack for ni.py */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2696 static PyObject *
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2697 find_from_args(f, nexti)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2698 PyFrameObject *f;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2699 int nexti;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2700 {
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2701 int opcode;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2702 int oparg;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2703 PyObject list, name;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2704 unsigned char *next_instr;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2705
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2706 next_instr = GETUSTRINGVALUE(f->f_code->co_code) + nexti;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2707 opcode = (*next_instr++);
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2708 if (opcode != IMPORT_FROM) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2709 Py_INCREF(Py_None);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2710 return Py_None;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2711 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2712
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2713 list = PyList_New(0);
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2714 if (list == NULL)
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2715 return NULL;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2716
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2717 do {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2718 oparg = (next_instr[1]<<8) + next_instr[0];
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2719 next_instr += 2;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2720 name = Getnamev(f, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2721 if (PyList_Append(list, name) < 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2722 Py_DECREF(list);
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2723 break;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2724 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2725 opcode = (*next_instr++);
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2726 } while (opcode == IMPORT_FROM);
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2727
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2728 return list;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	2729 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2730
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2731
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2732 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2733
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2734 PyObject *
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2735 getarray(a)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2736 long a[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2737 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2738 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2739 PyObject *l = PyList_New(256);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2740 if (l == NULL) return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2741 for (i = 0; i < 256; i++) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2742 PyObject *x = PyInt_FromLong(a[i]);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2743 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2744 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2745 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2746 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2747 PyList_SetItem(l, i, x);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2748 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2749 for (i = 0; i < 256; i++)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2750 a[i] = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2751 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2752 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2753
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2754 PyObject *
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2755 _Py_GetDXProfile(self, args)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2756 PyObject self, args;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2757 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2758 #ifndef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2759 return getarray(dxp);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2760 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2761 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2762 PyObject *l = PyList_New(257);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2763 if (l == NULL) return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2764 for (i = 0; i < 257; i++) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2765 PyObject *x = getarray(dxpairs[i]);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2766 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2767 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2768 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2769 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2770 PyList_SetItem(l, i, x);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2771 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2772 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2773 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2774 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2775
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	2776 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 5758:bfe9ba74c19e legacy-trunk