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

annotate Python/ceval.c @ 5405:b7871ca930ad legacy-trunk

Massive changes for separate thread state management. All per-thread globals are moved into a struct which is manipulated separately.

author	Guido van Rossum <guido@python.org>
date	Mon, 05 May 1997 20:56:21 +0000
parents	f2132d1f66a6
children	10267fdc7531

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"
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	46 #include "graminit.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	48 #include <ctype.h>
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	49
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	50 #ifdef HAVE_LIMITS_H
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	51 #include <limits.h>
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	52 #else
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	53 #define INT_MAX 2147483647
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	54 #endif
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	55
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	56 /* 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	57 /* #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	58
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	59 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	60 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	61 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	62 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	64
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	65
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	66 /* Forward declarations */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	67
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	68 static PyObject eval_code2 Py_PROTO((PyCodeObject ,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	69 PyObject , PyObject ,
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 **, int,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	73 PyObject *));
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	74 #ifdef LLTRACE
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	75 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	76 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	77 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	78 PyFrameObject *));
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	79 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	80 PyFrameObject , char , PyObject *));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	81 static PyObject add Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	82 static PyObject sub Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	83 static PyObject powerop Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	84 static PyObject mul Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	85 static PyObject divide Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	86 static PyObject mod Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	87 static PyObject neg Py_PROTO((PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	88 static PyObject pos Py_PROTO((PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	89 static PyObject not Py_PROTO((PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	90 static PyObject invert Py_PROTO((PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	91 static PyObject lshift Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	92 static PyObject rshift Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	93 static PyObject and Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	94 static PyObject xor Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	95 static PyObject or Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	96 static PyObject call_builtin Py_PROTO((PyObject , PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	97 static PyObject call_function Py_PROTO((PyObject , PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	98 static PyObject apply_subscript Py_PROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	99 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	100 static int slice_index Py_PROTO((PyObject , int ));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	101 static PyObject apply_slice Py_PROTO((PyObject , PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	102 static int assign_subscript Py_PROTO((PyObject , PyObject , PyObject *));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	103 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	104 PyObject , PyObject ));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	105 static int cmp_exception Py_PROTO((PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	106 static int cmp_member Py_PROTO((PyObject , PyObject ));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	107 static PyObject cmp_outcome Py_PROTO((int, PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	108 static int import_from Py_PROTO((PyObject , PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	109 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	110 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	111 PyObject , PyObject , PyObject *));
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	112 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	113 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	114 PyObject , PyObject , PyObject *));
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	115 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	116
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	117
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	118 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	119 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	120 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	121 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	122 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	123 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	124 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	125 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	126 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	127
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	128
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	129 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	130
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	131 #include <errno.h>
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	132 #include "thread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	133
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	134 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	135
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	136 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	137 static long main_thread = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	138
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	139 void
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	140 PyEval_InitThreads()
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	141 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	142 if (interpreter_lock)
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	143 return;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	144 _PyThread_Started = 1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	145 interpreter_lock = allocate_lock();
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	146 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	147 main_thread = get_thread_ident();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	148 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	149
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	150 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	151
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	152 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	153 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	154 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	155
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	156 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	157 PyEval_SaveThread()
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	158 {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	159 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	160 if (interpreter_lock) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	161 PyThreadState *tstate = PyThreadState_Swap(NULL);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	162 PyObject res = tstate ? (PyObject ) (tstate->frame) : NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	163 release_lock(interpreter_lock);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	164 return res;
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 #endif
1271 2919b448e385 * Microscopic corrections to make things compile on the Cray APP. Guido van Rossum <guido@python.org> parents: 1263 diff changeset	167 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	168 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	169
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	170 void
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	171 PyEval_RestoreThread(x)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	172 PyObject *x;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	173 {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	174 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	175 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	176 int err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	177 err = errno;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	178 acquire_lock(interpreter_lock, 1);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	179 errno = err;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	180 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	181 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	182 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	183 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	184
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	185
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	186 /* 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	187 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	188 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	189 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	190 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	191 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	192
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	193 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	194 (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	195 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	196
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	197 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	198 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	199
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	200 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	201 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	202 will execute them.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	203 #endif
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	204
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	205 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	206 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	207 (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	208 (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	209 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	210 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	211 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	212 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	213
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	214 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	215 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	216 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	217
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	218 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	219 static struct {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	220 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	221 ANY *arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	222 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	223 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	224 static volatile int pendinglast = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	225 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	226
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	227 int
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	228 Py_AddPendingCall(func, arg)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	229 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	230 ANY *arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	231 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	232 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	233 int i, j;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	234 /* 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	235 /* 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	236 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	237 if (busy)
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	238 return -1;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	239 busy = 1;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	240 i = pendinglast;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	241 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	242 if (j == pendingfirst)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	243 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	244 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	245 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	246 pendinglast = j;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	247 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	248 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	249 /* 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	250 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	251 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	252
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	253 int
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	254 Py_MakePendingCalls()
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	255 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	256 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	257 #ifdef WITH_THREAD
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	258 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	259 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	260 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	261 if (busy)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	262 return 0;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	263 busy = 1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	264 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	265 for (;;) {
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	266 int i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	267 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	268 ANY *arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	269 i = pendingfirst;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	270 if (i == pendinglast)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	271 break; /* Queue empty */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	272 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	273 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	274 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	275 if (func(arg) < 0) {
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	276 busy = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	277 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	278 return -1;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	279 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	280 }
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	281 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	282 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	283 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	284
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	285
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	286 /* 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	287
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	288 enum why_code {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	289 WHY_NOT, /* No error */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	290 WHY_EXCEPTION, /* Exception occurred */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	291 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	292 WHY_RETURN, /* 'return' statement */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	293 WHY_BREAK /* 'break' statement */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	294 };
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	295
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	296 static enum why_code do_raise Py_PROTO((PyObject , PyObject , PyObject *));
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	297
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	298
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	299 /* Backward compatible interface */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	300
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	301 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	302 PyEval_EvalCode(co, globals, locals)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	303 PyCodeObject *co;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	304 PyObject *globals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	305 PyObject *locals;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	306 {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	307 return eval_code2(co,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	308 globals, locals,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	309 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	310 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	311 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	312 (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	313 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	314
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	315
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	316 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	317
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	318 #ifndef MAX_RECURSION_DEPTH
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	319 #define MAX_RECURSION_DEPTH 10000
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	320 #endif
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	321
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	322 static PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	323 eval_code2(co, globals, locals,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	324 args, argcount, kws, kwcount, defs, defcount, owner)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	325 PyCodeObject *co;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	326 PyObject *globals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	327 PyObject *locals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	328 PyObject **args;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	329 int argcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	330 PyObject *kws; / length: 2kwcount /
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	331 int kwcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	332 PyObject **defs;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	333 int defcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	334 PyObject *owner;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	335 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	336 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	337 int lastopcode = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	338 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	339 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	340 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	341 register int oparg = 0; /* Current opcode argument, if any */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	342 register PyObject **stack_pointer;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	343 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	344 register int err; /* Error status -- nonzero if error */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	345 register PyObject x; / Result object -- NULL if error */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	346 register PyObject v; / Temporary objects popped off stack */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	347 register PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	348 register PyObject *u;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	349 register PyObject *t;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	350 register PyFrameObject f; / Current frame */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	351 register PyObject **fastlocals = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	352 PyObject retval = NULL; / Return value */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	353 PyThreadState *tstate = PyThreadState_Get();
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	354 #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	355 int lltrace;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	356 #endif
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	357 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	358 /* 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	359 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	360 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	361
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	362 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	363
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	364 #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	365 #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	366 #define GETNAMEV(i) Getnamev(f, i)
5052 7841c48cdb5b Two small changes: Guido van Rossum <guido@python.org> parents: 5050 diff changeset	367 #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	368 #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	369 #define NEXTOP() (*next_instr++)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	370 #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	371 #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	372 #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	373
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	374 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	375
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	376 #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	377 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	378 #define TOP() (stack_pointer[-1])
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	379 #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	380 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	381
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	382 #ifdef LLTRACE
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	383 #define PUSH(v) (BASIC_PUSH(v), lltrace && prtrace(TOP(), "push"))
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	384 #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	385 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	386 #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	387 #define POP() BASIC_POP()
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	388 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	389
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	390 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	391
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	392 #define GETLOCAL(i) (fastlocals[i])
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	393 #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	394 GETLOCAL(i) = value; } while (0)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	395
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	396 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	397
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	398 if (tstate == NULL)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	399 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	400
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	401 #ifdef USE_STACKCHECK
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	402 if (tstate->recursion_depth%10 == 0 && PyOS_CheckStack()) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	403 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	404 return NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	405 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	406 #endif
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	407
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	408 if (globals == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	409 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	410 return NULL;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	411 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	412
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	413 #ifdef LLTRACE
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	414 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	415 #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	416
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	417 f = PyFrame_New(
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	418 tstate, /back/
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	419 co, /code/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	420 globals, /globals/
5014 0bfac89afc83 Changes for frame object speedup: Guido van Rossum <guido@python.org> parents: 5002 diff changeset	421 locals); /locals/
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	422 if (f == NULL)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	423 return NULL;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	424
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	425 tstate->frame = f;
5052 7841c48cdb5b Two small changes: Guido van Rossum <guido@python.org> parents: 5050 diff changeset	426 fastlocals = f->f_localsplus;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	427
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	428 if (co->co_argcount > 0 \|\|
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	429 co->co_flags & (CO_VARARGS \| CO_VARKEYWORDS)) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	430 int i;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	431 int n = argcount;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	432 PyObject *kwdict = NULL;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	433 if (co->co_flags & CO_VARKEYWORDS) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	434 kwdict = PyDict_New();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	435 if (kwdict == NULL)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	436 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	437 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	438 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	439 i++;
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	440 SETLOCAL(i, kwdict);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	441 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	442 if (argcount > co->co_argcount) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	443 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	444 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	445 "too many arguments");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	446 goto fail;
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 n = co->co_argcount;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	449 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	450 for (i = 0; i < n; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	451 x = args[i];
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	452 Py_INCREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	453 SETLOCAL(i, x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	454 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	455 if (co->co_flags & CO_VARARGS) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	456 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	457 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	458 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	459 SETLOCAL(co->co_argcount, u);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	460 for (i = n; i < argcount; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	461 x = args[i];
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	462 Py_INCREF(x);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	463 PyTuple_SET_ITEM(u, i-n, x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	464 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	465 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	466 for (i = 0; i < kwcount; i++) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	467 PyObject keyword = kws[2i];
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	468 PyObject value = kws[2i + 1];
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	469 int j;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	470 /* XXX slow -- speed up using dictionary? */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	471 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	472 PyObject *nm = PyTuple_GET_ITEM(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	473 co->co_varnames, j);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	474 if (PyObject_Compare(keyword, nm) == 0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	475 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	476 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	477 if (j >= co->co_argcount) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	478 if (kwdict == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	479 PyErr_Format(PyExc_TypeError,
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	480 "unexpected keyword argument: %.400s",
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	481 PyString_AsString(keyword));
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	482 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	483 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	484 PyDict_SetItem(kwdict, keyword, value);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	485 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	486 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	487 if (GETLOCAL(j) != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	488 PyErr_SetString(PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	489 "keyword parameter redefined");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	490 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	491 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	492 Py_INCREF(value);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	493 SETLOCAL(j, value);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	494 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	495 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	496 if (argcount < co->co_argcount) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	497 int m = co->co_argcount - defcount;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	498 for (i = argcount; i < m; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	499 if (GETLOCAL(i) == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	500 PyErr_SetString(PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	501 "not enough arguments");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	502 goto fail;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	503 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	504 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	505 if (n > m)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	506 i = n - m;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	507 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	508 i = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	509 for (; i < defcount; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	510 if (GETLOCAL(m+i) == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	511 PyObject *def = defs[i];
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	512 Py_INCREF(def);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	513 SETLOCAL(m+i, def);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	514 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	515 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	516 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	517 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	518 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	519 if (argcount > 0 \|\| kwcount > 0) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	520 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	521 "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	522 goto fail;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	523 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	524 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	525
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	526 if (tstate->sys_tracefunc != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	527 /* 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	528 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	529 Its return value, if not None, is a function that
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	530 will be called at the start of each executed line
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	531 of code. (Actually, the function must return
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	532 itself in order to continue tracing.)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	533 The trace functions are called with three arguments:
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	534 a pointer to the current frame, a string indicating
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	535 why the function is called, and an argument which
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	536 depends on the situation. The global trace function
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	537 (sys.trace) is also called whenever an exception
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	538 is detected. */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	539 if (call_trace(&tstate->sys_tracefunc,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	540 &f->f_trace, f, "call",
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	541 Py_None/XXX how to compute arguments now?/)) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	542 /* 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	543 goto fail;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	544 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	545 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	546
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	547 if (tstate->sys_profilefunc != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	548 /* 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	549 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	550 if (call_trace(&tstate->sys_profilefunc,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	551 (PyObject**)0, f, "call",
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	552 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	553 goto fail;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	554 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	555 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	556
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	557 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	558 --tstate->recursion_depth;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	559 PyErr_SetString(PyExc_RuntimeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	560 "Maximum recursion depth exceeded");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	561 tstate->frame = f->f_back;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	562 Py_DECREF(f);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	563 return NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	564 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	565
5052 7841c48cdb5b Two small changes: Guido van Rossum <guido@python.org> parents: 5050 diff changeset	566 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	567 stack_pointer = f->f_valuestack;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	568
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	569 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	570 err = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	571 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	572
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	573 for (;;) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	574 /* 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	575 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	576 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	577 ``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	578 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	579 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	580 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	581
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	582 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	583 tstate->ticker = tstate->sys_checkinterval;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	584 if (things_to_do) {
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	585 if (Py_MakePendingCalls() < 0) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	586 why = WHY_EXCEPTION;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	587 goto on_error;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	588 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	589 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	590 #if !defined(HAVE_SIGNAL_H) && !defined(macintosh)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	591 /* 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	592 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	593 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	594 DOS, alas, we have to call it. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	595 if (PyErr_CheckSignals()) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	596 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	597 goto on_error;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	598 }
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	599 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	600
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	601 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	602 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	603 /* Give another thread a chance */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	604
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	605 PyThreadState *tstate =
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	606 PyThreadState_Swap(NULL);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	607 release_lock(interpreter_lock);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	608
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	609 /* Other threads may run now */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	610
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	611 acquire_lock(interpreter_lock, 1);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	612 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	613 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	614 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	615 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	616
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	617 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	618
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	619 #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	620 f->f_lasti = INSTR_OFFSET();
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	621 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	622
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	623 opcode = NEXTOP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	624 if (HAS_ARG(opcode))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	625 oparg = NEXTARG();
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	626 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	627 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	628 dxpairs[lastopcode][opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	629 lastopcode = opcode;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	630 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	631 dxp[opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	632 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	633
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	634 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	635 /* Instruction tracing */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	636
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	637 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	638 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	639 printf("%d: %d, %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	640 (int) (INSTR_OFFSET() - 3),
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	641 opcode, oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	642 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	643 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	644 printf("%d: %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	645 (int) (INSTR_OFFSET() - 1), opcode);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	646 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	647 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	648 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	649
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	650 /* Main switch on opcode */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	651
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	652 switch (opcode) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	653
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	654 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	655 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	656 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	657 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	658
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	659 /* 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	660
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	661 case POP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	662 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	663 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	664 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	665
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	666 case ROT_TWO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	667 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	668 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	669 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	670 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	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 ROT_THREE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	674 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	675 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	676 x = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	677 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	678 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	679 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	680 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	681
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	682 case DUP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	683 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	684 Py_INCREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	685 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	686 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	687
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	688 case UNARY_POSITIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	689 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	690 x = pos(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	691 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	692 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	693 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	694 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	695
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	696 case UNARY_NEGATIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	697 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	698 x = neg(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	699 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	700 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	701 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	702 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	703
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	704 case UNARY_NOT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	705 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	706 x = not(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	707 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	708 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	709 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	710 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	711
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	712 case UNARY_CONVERT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	713 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	714 x = PyObject_Repr(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	715 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	716 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	717 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	718 break;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	719
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	720 case UNARY_INVERT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	721 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	722 x = invert(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	723 Py_DECREF(v);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	724 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	725 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	726 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	727
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	728 case BINARY_POWER:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	729 w = POP();
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	730 v = POP();
3694 581f073f071d Renamed static pow() to powerop() to avoid name conflict in some compilers. Guido van Rossum <guido@python.org> parents: 3610 diff changeset	731 x = powerop(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	732 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	733 Py_DECREF(w);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	734 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	735 if (x != NULL) continue;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	736 break;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	737
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	738 case BINARY_MULTIPLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	739 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	740 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	741 x = mul(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	742 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	743 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	744 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	745 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	746 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	747
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	748 case BINARY_DIVIDE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	749 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	750 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	751 x = divide(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	752 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	753 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	754 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	755 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	756 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	757
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	758 case BINARY_MODULO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	759 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	760 v = POP();
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	761 x = mod(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	762 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	763 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	764 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	765 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	766 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	767
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	768 case BINARY_ADD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	769 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	770 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	771 x = add(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	772 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	773 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	774 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	775 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	776 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	777
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	778 case BINARY_SUBTRACT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	779 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	780 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	781 x = sub(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	782 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	783 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	784 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	785 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	786 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	787
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	788 case BINARY_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	789 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	790 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	791 x = apply_subscript(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	792 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	793 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	794 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	795 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	796 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	797
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	798 case BINARY_LSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	799 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	800 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	801 x = lshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	802 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	803 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	804 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	805 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	806 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	807
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	808 case BINARY_RSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	809 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	810 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	811 x = rshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	812 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	813 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	814 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	815 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	816 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	817
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	818 case BINARY_AND:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	819 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	820 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	821 x = and(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	822 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	823 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	824 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	825 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	826 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	827
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	828 case BINARY_XOR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	829 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	830 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	831 x = xor(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	832 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	833 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	834 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	835 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	836 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	837
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	838 case BINARY_OR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	839 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	840 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	841 x = or(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	842 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	843 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	844 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	845 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	846 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	847
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	848 case SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	849 case SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	850 case SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	851 case SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	852 if ((opcode-SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	853 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	854 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	855 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	856 if ((opcode-SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	857 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	858 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	859 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	860 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	861 x = apply_slice(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	862 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	863 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	864 Py_XDECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	865 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	866 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	867 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	868
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	869 case STORE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	870 case STORE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	871 case STORE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	872 case STORE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	873 if ((opcode-STORE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	874 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	875 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	876 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	877 if ((opcode-STORE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	878 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	879 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	880 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	881 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	882 t = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	883 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	884 Py_DECREF(t);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	885 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	886 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	887 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	888 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	889 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	890
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	891 case DELETE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	892 case DELETE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	893 case DELETE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	894 case DELETE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	895 if ((opcode-DELETE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	896 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	897 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	898 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	899 if ((opcode-DELETE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	900 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	901 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	902 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	903 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	904 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	905 /* del u[v:w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	906 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	907 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	908 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	909 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	910 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	911
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	912 case STORE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	913 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	914 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	915 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	916 /* v[w] = u */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	917 err = assign_subscript(v, w, u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	918 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	919 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	920 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	921 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	922 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	923
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	924 case DELETE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	925 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	926 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	927 /* del v[w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	928 err = assign_subscript(v, w, (PyObject *)NULL);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	929 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	930 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	931 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	932 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	933
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	934 case PRINT_EXPR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	935 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	936 /* Print value except if procedure result */
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	937 /* Before printing, also assign to '_' */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	938 if (v != Py_None &&
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	939 (err = PyDict_SetItemString(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	940 f->f_builtins, "_", v)) == 0 &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	941 !Py_SuppressPrintingFlag) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	942 Py_FlushLine();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	943 x = PySys_GetObject("stdout");
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	944 err = PyFile_WriteObject(v, x, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	945 PyFile_SoftSpace(x, 1);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	946 Py_FlushLine();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	947 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	948 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	949 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	950
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	951 case PRINT_ITEM:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	952 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	953 w = PySys_GetObject("stdout");
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	954 if (PyFile_SoftSpace(w, 1))
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	955 PyFile_WriteString(" ", w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	956 err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	957 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	958 /* XXX move into writeobject() ? */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	959 char *s = PyString_AsString(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	960 int len = PyString_Size(v);
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2295 diff changeset	961 if (len > 0 &&
07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2295 diff changeset	962 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	963 s[len-1] != ' ')
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	964 PyFile_SoftSpace(w, 0);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	965 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	966 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	967 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	968 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	969
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	970 case PRINT_NEWLINE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	971 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	972 if (x == NULL)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	973 PyErr_SetString(PyExc_RuntimeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	974 "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	975 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	976 PyFile_WriteString("\n", x);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	977 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	978 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	979 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	980
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	981 case BREAK_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	982 why = WHY_BREAK;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	983 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	984
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	985 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	986 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	987 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	988 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	989 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	990 /* 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	991 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	992 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	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 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	995 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	996 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	997 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	998 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	999 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	1000 "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	1001 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	1002 break;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1003 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1004 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1005
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1006 case LOAD_LOCALS:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1007 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	1008 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1009 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1010 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1011 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1012 Py_INCREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1013 PUSH(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1014 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1015
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1016 case RETURN_VALUE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1017 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1018 why = WHY_RETURN;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1019 break;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1020
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1021 case EXEC_STMT:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1022 w = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1023 v = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1024 u = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1025 err = exec_statement(f, u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1026 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1027 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1028 Py_DECREF(w);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1029 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1030
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1031 case POP_BLOCK:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1032 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1033 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	1034 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	1035 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1036 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1037 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1038 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1039 break;
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 case END_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1042 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1043 if (PyInt_Check(v)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1044 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	1045 if (why == WHY_RETURN)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1046 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1047 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1048 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	1049 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	1050 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1051 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	1052 why = WHY_RERAISE;
2872 d3b07ba3e12d fix bogus DECREF in finally clause Guido van Rossum <guido@python.org> parents: 2866 diff changeset	1053 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1054 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1055 else if (v != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1056 PyErr_SetString(PyExc_SystemError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1057 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1058 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1059 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1060 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1061 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1062
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1063 case BUILD_CLASS:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1064 u = POP();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1065 v = POP();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1066 w = POP();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1067 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	1068 PUSH(x);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1069 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1070 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1071 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1072 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1073
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1074 case STORE_NAME:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1075 w = GETNAMEV(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1076 v = POP();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1077 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	1078 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1079 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1080 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1081 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1082 err = PyDict_SetItem(x, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1083 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1084 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1085
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1086 case DELETE_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1087 w = GETNAMEV(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1088 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	1089 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1090 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1091 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1092 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1093 if ((err = PyDict_DelItem(x, w)) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1094 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	1095 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1096
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1097 #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	1098 default: switch (opcode) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1099 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1100
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1101 case UNPACK_TUPLE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1102 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1103 if (!PyTuple_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1104 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1105 "unpack non-tuple");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1106 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1107 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1108 else if (PyTuple_Size(v) != oparg) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1109 PyErr_SetString(PyExc_ValueError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1110 "unpack tuple of wrong size");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1111 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1112 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1113 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1114 for (; --oparg >= 0; ) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1115 w = PyTuple_GET_ITEM(v, oparg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1116 Py_INCREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1117 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1118 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1119 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1120 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1121 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1122
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1123 case UNPACK_LIST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1124 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1125 if (!PyList_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1126 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1127 "unpack non-list");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1128 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1129 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1130 else if (PyList_Size(v) != oparg) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1131 PyErr_SetString(PyExc_ValueError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1132 "unpack list of wrong size");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1133 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1134 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1135 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1136 for (; --oparg >= 0; ) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1137 w = PyList_GetItem(v, oparg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1138 Py_INCREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1139 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1140 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1141 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1142 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1143 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1144
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1145 case STORE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1146 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1147 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1148 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1149 err = PyObject_SetAttr(v, w, u); /* v.w = u */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1150 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1151 Py_DECREF(u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1152 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1153
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1154 case DELETE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1155 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1156 v = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1157 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	1158 /* del v.w */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1159 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1160 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1161
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1162 case STORE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1163 w = GETNAMEV(oparg);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1164 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1165 err = PyDict_SetItem(f->f_globals, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1166 Py_DECREF(v);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1167 break;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1168
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1169 case DELETE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1170 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1171 if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1172 PyErr_SetObject(PyExc_NameError, w);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1173 break;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1174
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1175 case LOAD_CONST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1176 x = GETCONST(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1177 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1178 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1179 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1180
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1181 case LOAD_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1182 w = GETNAMEV(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1183 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	1184 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1185 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1186 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1187 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1188 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	1189 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1190 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1191 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	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_builtins, 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) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1196 PyErr_SetObject(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1197 PyExc_NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1198 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1199 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1200 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1201 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1202 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1203 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1204 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1205
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1206 case LOAD_GLOBAL:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1207 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1208 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	1209 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1210 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1211 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	1212 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1213 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	1214 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1215 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1216 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1217 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1218 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1219 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1220
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1221 case LOAD_FAST:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1222 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	1223 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1224 PyErr_SetObject(PyExc_NameError,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1225 PyTuple_GetItem(co->co_varnames,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1226 oparg));
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1227 break;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1228 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1229 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	1230 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	1231 if (x != NULL) continue;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1232 break;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1233
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1234 case STORE_FAST:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1235 v = POP();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1236 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	1237 continue;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1238
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1239 case DELETE_FAST:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1240 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	1241 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1242
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1243 case BUILD_TUPLE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1244 x = PyTuple_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1245 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1246 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1247 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1248 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	1249 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1250 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	1251 continue;
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 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1254
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1255 case BUILD_LIST:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1256 x = PyList_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1257 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1258 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1259 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1260 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	1261 if (err != 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1262 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1263 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1264 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	1265 continue;
173 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 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1268
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1269 case BUILD_MAP:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1270 x = PyDict_New();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1271 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	1272 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1273 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1274
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1275 case LOAD_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1276 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1277 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1278 x = PyObject_GetAttr(v, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1279 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1280 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	1281 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1282 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1283
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1284 case COMPARE_OP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1285 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1286 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	1287 x = cmp_outcome(oparg, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1288 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1289 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1290 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	1291 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1292 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1293
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1294 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	1295 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1296 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	1297 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1298 PyErr_SetString(PyExc_ImportError,
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1299 "__import__ not found");
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1300 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1301 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1302 if (PyCFunction_Check(x)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1303 u = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1304 Py_INCREF(u);
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1305 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1306 else {
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1307 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	1308 if (u == NULL) {
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1309 x = u;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1310 break;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1311 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1312 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1313 w = Py_BuildValue("(OOOO)",
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1314 w,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1315 f->f_globals,
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1316 f->f_locals == NULL ?
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1317 Py_None : f->f_locals,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1318 u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1319 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	1320 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	1321 x = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1322 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1323 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1324 x = PyEval_CallObject(x, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1325 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	1326 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	1327 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1328 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1329
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1330 case IMPORT_FROM:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1331 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1332 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1333 PyFrame_FastToLocals(f);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1334 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	1335 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1336 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1337 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1338 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1339 err = import_from(x, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1340 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	1341 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1342 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1343
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1344 case JUMP_FORWARD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1345 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	1346 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1347
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1348 case JUMP_IF_FALSE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1349 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	1350 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1351 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1352 else if (err == 0)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1353 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	1354 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1355 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1356 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1357
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1358 case JUMP_IF_TRUE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1359 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	1360 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1361 err = 0;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1362 JUMPBY(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1363 }
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1364 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	1365 ;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1366 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1367 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1368 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1369
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1370 case JUMP_ABSOLUTE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1371 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	1372 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1373
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1374 case FOR_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1375 /* for v in s: ...
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1376 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	1377 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	1378 but if loop exhausted:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1379 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	1380 w = POP(); /* Loop index */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1381 v = POP(); /* Sequence object */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1382 u = loop_subscript(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1383 if (u != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1384 PUSH(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1385 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	1386 PUSH(x);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1387 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1388 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	1389 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1390 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1391 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1392 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1393 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1394 /* 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	1395 but also an error: */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1396 if (PyErr_Occurred())
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1397 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	1398 else {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1399 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	1400 continue;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1401 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1402 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1403 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1404
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1405 case SETUP_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1406 case SETUP_EXCEPT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1407 case SETUP_FINALLY:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1408 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	1409 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	1410 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1411
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1412 case SET_LINENO:
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1413 #ifdef LLTRACE
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1414 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	1415 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	1416 #endif
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1417 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	1418 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	1419 continue;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1420 /* 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	1421 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	1422 err = call_trace(&f->f_trace, &f->f_trace,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1423 f, "line", Py_None);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1424 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	1425
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	1426 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	1427 {
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 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	1429 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	1430 int n = na + 2*nk;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1431 PyObject **pfunc = stack_pointer - n - 1;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1432 PyObject func = pfunc;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1433 PyObject *self = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1434 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	1435 f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1436 if (PyMethod_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1437 self = PyMethod_Self(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1438 class = PyMethod_Class(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1439 func = PyMethod_Function(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1440 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	1441 if (self != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1442 Py_INCREF(self);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1443 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	1444 *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	1445 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	1446 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	1447 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1448 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1449 /* Unbound methods must be
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1450 called with an instance of
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1451 the class (or a derived
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1452 class) as first argument */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1453 if (na > 0 &&
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1454 (self = stack_pointer[-n])
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1455 != NULL &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1456 PyInstance_Check(self) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1457 PyClass_IsSubclass(
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1458 (PyObject *)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1459 (((PyInstanceObject *)self)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1460 ->in_class),
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1461 class))
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1462 /* Handy-dandy */ ;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1463 else {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1464 PyErr_SetString(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1465 PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1466 "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	1467 x = NULL;
2bddfb3cfcf1 don't return from main loop when error occurs Guido van Rossum <guido@python.org> parents: 3099 diff changeset	1468 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	1469 }
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	1470 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1471 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1472 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1473 Py_INCREF(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1474 if (PyFunction_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1475 PyObject *co = PyFunction_GetCode(func);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1476 PyObject *globals =
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1477 PyFunction_GetGlobals(func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1478 PyObject *argdefs =
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1479 PyFunction_GetDefaults(func);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1480 PyObject **d;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1481 int nd;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1482 if (argdefs != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1483 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	1484 nd = ((PyTupleObject *)argdefs) ->
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1485 ob_size;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1486 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1487 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1488 d = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1489 nd = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1490 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1491 x = eval_code2(
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1492 (PyCodeObject *)co,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1493 globals, (PyObject *)NULL,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1494 stack_pointer-n, na,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1495 stack_pointer-2*nk, nk,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1496 d, nd,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1497 class);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1498 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1499 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1500 PyObject *args = PyTuple_New(na);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1501 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	1502 if (args == NULL) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1503 x = NULL;
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1504 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1505 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1506 if (nk > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1507 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	1508 if (kwdict == NULL) {
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1509 x = NULL;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1510 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1511 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1512 err = 0;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1513 while (--nk >= 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1514 PyObject *value = POP();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1515 PyObject *key = POP();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1516 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	1517 kwdict, key, value);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1518 Py_DECREF(key);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1519 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	1520 if (err)
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1521 break;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1522 }
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1523 if (err) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1524 Py_DECREF(args);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1525 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	1526 break;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1527 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1528 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1529 while (--na >= 0) {
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1530 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1531 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	1532 }
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1533 x = PyEval_CallObjectWithKeywords(
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1534 func, args, kwdict);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1535 Py_DECREF(args);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1536 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	1537 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1538 Py_DECREF(func);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1539 while (stack_pointer > pfunc) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1540 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1541 Py_DECREF(w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1542 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1543 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	1544 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	1545 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	1546 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1547
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1548 case MAKE_FUNCTION:
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1549 v = POP(); /* code object */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1550 x = PyFunction_New(v, f->f_globals);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1551 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1552 /* XXX Maybe this should be a separate opcode? */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1553 if (x != NULL && oparg > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1554 v = PyTuple_New(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1555 if (v == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1556 Py_DECREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1557 x = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1558 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1559 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1560 while (--oparg >= 0) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1561 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1562 PyTuple_SET_ITEM(v, oparg, w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1563 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1564 err = PyFunction_SetDefaults(x, v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1565 Py_DECREF(v);
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 PUSH(x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1568 break;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1569
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1570 case BUILD_SLICE:
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1571 if (oparg == 3)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1572 w = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1573 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1574 w = NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1575 v = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1576 u = POP();
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	1577 x = PySlice_New(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1578 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1579 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1580 Py_XDECREF(w);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1581 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	1582 if (x != NULL) continue;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1583 break;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1584
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1585
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1586 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1587 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1588 "XXX lineno: %d, opcode: %d\n",
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1589 f->f_lineno, opcode);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1590 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	1591 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1592 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1593
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1594 #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	1595 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1596 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1597
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1598 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1599
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1600 on_error:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1601
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1602 /* 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	1603
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1604 if (why == WHY_NOT) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1605 if (err == 0 && x != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1606 #ifdef CHECKEXC
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1607 if (PyErr_Occurred())
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1608 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1609 "XXX undetected error\n");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1610 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1611 #endif
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1612 continue; /* Normal, fast path */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1613 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1614 why = WHY_EXCEPTION;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1615 x = Py_None;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1616 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1617 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1618
814 f08d34499269 reverse sense of test for CHECKEXC Guido van Rossum <guido@python.org> parents: 802 diff changeset	1619 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1620 /* Double-check exception status */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1621
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1622 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1623 if (!PyErr_Occurred()) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1624 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	1625 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1626 "ghost error");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1627 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1628 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1629 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1630 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1631 if (PyErr_Occurred()) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1632 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1633 "XXX undetected error (why=%d)\n",
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1634 why);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1635 why = WHY_EXCEPTION;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1636 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1637 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1638 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1639
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1640 /* 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	1641
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1642 if (why == WHY_EXCEPTION) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1643 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	1644 if (HAS_ARG(opcode))
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1645 f->f_lasti -= 2;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1646 PyTraceBack_Here(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1647
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1648 if (f->f_trace)
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1649 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	1650 if (tstate->sys_profilefunc)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1651 call_exc_trace(&tstate->sys_profilefunc,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1652 (PyObject**)0, f);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1653 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1654
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1655 /* 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	1656
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1657 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1658 why = 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 /* 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	1661
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1662 while (why != WHY_NOT && f->f_iblock > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1663 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	1664 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	1665 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1666 Py_XDECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1667 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1668 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	1669 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1670 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1671 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1672 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1673 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	1674 (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	1675 why == WHY_EXCEPTION)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1676 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1677 PyObject exc, val, *tb;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1678 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	1679 if (val == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1680 val = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1681 Py_INCREF(val);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1682 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1683 /* Make the raw exception data
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1684 available to the handler,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1685 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	1686 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	1687 this for 'finally'. */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1688 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	1689 set_exc_info(tstate,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1690 exc, val, tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1691 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1692 PUSH(tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1693 PUSH(val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1694 PUSH(exc);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1695 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1696 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1697 if (why == WHY_RETURN)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1698 PUSH(retval);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1699 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	1700 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1701 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1702 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1703 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1704 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1705 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1706 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1707
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1708 /* 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	1709
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1710 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1711 break;
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 } /* main loop */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1714
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1715 /* Pop remaining stack entries */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1716
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1717 while (!EMPTY()) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1718 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1719 Py_XDECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1720 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1721
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1722 if (why != WHY_RETURN)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1723 retval = NULL;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1724
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1725 if (f->f_trace) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1726 if (why == WHY_RETURN) {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1727 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	1728 "return", retval)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1729 Py_XDECREF(retval);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1730 retval = NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1731 why = WHY_EXCEPTION;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1732 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1733 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1734 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1735
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1736 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	1737 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	1738 f, "return", retval)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1739 Py_XDECREF(retval);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1740 retval = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1741 why = WHY_EXCEPTION;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1742 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1743 }
5023 75c1ee882a4a Kill all local variables on function return. This closes a gigantic Guido van Rossum <guido@python.org> parents: 5021 diff changeset	1744
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1745 reset_exc_info(tstate);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1746
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1747 --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	1748
fde73467b584 Change the control flow for error handling in the function prelude to Guido van Rossum <guido@python.org> parents: 5023 diff changeset	1749 fail: /* Jump here from prelude on failure */
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1750
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1751 /* 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	1752
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1753 tstate->frame = f->f_back;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1754 Py_DECREF(f);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1755
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1756 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1757 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1758
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1759 static void
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1760 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	1761 PyThreadState *tstate;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1762 PyObject *type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1763 PyObject *value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1764 PyObject *tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1765 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1766 PyFrameObject *frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1767 frame = tstate->frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1768 if (frame->f_exc_type == NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1769 /* 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	1770 /* 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	1771 Py_XDECREF(frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1772 Py_XDECREF(frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1773 Py_XDECREF(frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1774 if (tstate->exc_type == NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1775 Py_INCREF(Py_None);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1776 tstate->exc_type = Py_None;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1777 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1778 Py_XINCREF(tstate->exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1779 Py_XINCREF(tstate->exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1780 Py_XINCREF(tstate->exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1781 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	1782 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	1783 frame->f_exc_traceback = tstate->exc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1784 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1785 /* Set new exception for this thread */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1786 Py_XINCREF(type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1787 Py_XINCREF(value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1788 Py_XINCREF(tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1789 tstate->exc_type = type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1790 tstate->exc_value = value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1791 tstate->exc_traceback = tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1792 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1793 PySys_SetObject("exc_type", type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1794 PySys_SetObject("exc_value", value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1795 PySys_SetObject("exc_traceback", tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1796 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1797
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1798 static void
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1799 reset_exc_info(tstate)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1800 PyThreadState *tstate;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1801 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1802 PyFrameObject *frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1803 frame = tstate->frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1804 if (frame->f_exc_type != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1805 /* This frame caught an exception */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1806 Py_XDECREF(tstate->exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1807 Py_XDECREF(tstate->exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1808 Py_XDECREF(tstate->exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1809 Py_XINCREF(frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1810 Py_XINCREF(frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1811 Py_XINCREF(frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1812 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	1813 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	1814 tstate->exc_traceback = frame->f_exc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1815 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1816 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	1817 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	1818 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	1819 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1820 Py_XDECREF(frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1821 Py_XDECREF(frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1822 Py_XDECREF(frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1823 frame->f_exc_type = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1824 frame->f_exc_value = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1825 frame->f_exc_traceback = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1826 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1827
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	1828 /* 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	1829 This consumes a reference count to each of its arguments. */
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	1830 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	1831 do_raise(type, value, tb)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1832 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	1833 {
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	1834 /* 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	1835 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	1836 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	1837 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	1838 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	1839 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	1840 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	1841 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	1842
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	1843 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	1844
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	1845 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	1846 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	1847 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	1848
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 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	1850 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	1851 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	1852
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 /* 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	1854 NULL. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1855 if (tb == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1856 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	1857 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	1858 }
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 else if (tb != NULL && !PyTraceBack_Check(tb)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1860 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	1861 "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	1862 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	1863 }
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 /* 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	1866 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1867 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1868 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	1869 }
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
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 /* Next, repeatedly, replace a tuple exception with its first item */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1872 while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1873 PyObject *tmp = type;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1874 type = PyTuple_GET_ITEM(type, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1875 Py_INCREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1876 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	1877 }
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 /* Now switch on the exception's type */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1880 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	1881 ;
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 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1883 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	1884 /* 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	1885 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	1886 it will be used to create an instance. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1887 if (PyInstance_Check(value)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1888 PyObject inclass = (PyObject)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1889 (((PyInstanceObject*)value)->in_class);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1890 if (!PyClass_IsSubclass(inclass, type)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1891 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	1892 "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	1893 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	1894 }
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	1895 }
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	1896 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	1897 /* Go instantiate the class */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1898 PyObject args, res;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1899 if (value == Py_None)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1900 args = Py_BuildValue("()");
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1901 else if (PyTuple_Check(value)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1902 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	1903 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	1904 }
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 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1906 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	1907 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	1908 goto raise_error;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1909 res = PyEval_CallObject(type, args);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1910 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	1911 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	1912 goto raise_error;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1913 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	1914 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	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 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1917 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	1918 /* Raising an instance. The value should be a dummy. */
5368 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 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	1921 "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	1922 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	1923 }
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 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	1925 /* Normalize to raise <class>, <instance> */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1926 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	1927 value = type;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1928 type = (PyObject) ((PyInstanceObject)type)->in_class;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1929 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	1930 }
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 }
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 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	1933 /* 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	1934 anyway, just not what you specified :-) */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1935 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	1936 "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	1937 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	1938 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1939 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	1940 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	1941 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	1942 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	1943 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	1944 raise_error:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1945 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1946 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1947 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	1948 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	1949 }
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
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1951 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1952 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1953 prtrace(v, str)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1954 PyObject *v;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1955 char *str;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1956 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1957 printf("%s ", str);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1958 if (PyObject_Print(v, stdout, 0) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1959 PyErr_Clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1960 printf("\n");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1961 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1962 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1963
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1964 static void
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1965 call_exc_trace(p_trace, p_newtrace, f)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1966 PyObject p_trace, p_newtrace;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1967 PyFrameObject *f;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1968 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1969 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	1970 int err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1971 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	1972 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1973 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1974 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	1975 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1976 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	1977 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1978 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	1979 return;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1980 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1981 err = call_trace(p_trace, p_newtrace, f, "exception", arg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1982 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	1983 if (err == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1984 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	1985 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1986 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1987 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1988 Py_XDECREF(traceback);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1989 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1990 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1991
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1992 static int
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1993 call_trace(p_trace, p_newtrace, f, msg, arg)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1994 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	1995 may not point to NULL variable initially */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1996 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	1997 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	1998 may be same variable as p_newtrace */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1999 PyFrameObject *f;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2000 char *msg;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2001 PyObject *arg;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2002 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2003 PyThreadState *tstate = f->f_tstate;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2004 PyObject args, what;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2005 PyObject *res = NULL;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2006
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2007 if (tstate->tracing) {
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2008 /* 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	2009 if (p_newtrace) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2010 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	2011 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2012 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2013 return 0;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2014 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2015
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2016 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	2017 if (args == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2018 goto Py_Cleanup;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2019 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	2020 if (what == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2021 goto Py_Cleanup;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2022 Py_INCREF(f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2023 PyTuple_SET_ITEM(args, 0, (PyObject *)f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2024 PyTuple_SET_ITEM(args, 1, what);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2025 if (arg == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2026 arg = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2027 Py_INCREF(arg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2028 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	2029 tstate->tracing++;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2030 PyFrame_FastToLocals(f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2031 res = PyEval_CallObject(p_trace, args); / May clear p_trace! /
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2032 PyFrame_LocalsToFast(f, 1);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2033 tstate->tracing--;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2034 Py_Cleanup:
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2035 Py_XDECREF(args);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2036 if (res == NULL) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2037 /* The trace proc raised an exception */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2038 PyTraceBack_Here(f);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2039 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	2040 *p_trace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2041 if (p_newtrace) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2042 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	2043 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2044 }
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	2045 return -1;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2046 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2047 else {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2048 if (p_newtrace) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2049 Py_XDECREF(*p_newtrace);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2050 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	2051 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2052 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2053 Py_INCREF(res);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2054 *p_newtrace = res;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2055 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2056 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2057 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	2058 return 0;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2059 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2060 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2061
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2062 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2063 PyEval_GetBuiltins()
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2064 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2065 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	2066 if (current_frame == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2067 return PyBuiltin_GetModule();
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2068 else
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2069 return current_frame->f_builtins;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2070 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2071
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2072 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2073 PyEval_GetLocals()
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2074 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2075 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	2076 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	2077 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2078 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	2079 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	2080 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 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_GetGlobals()
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: 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;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2086 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2087 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2088 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2089 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2090 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: 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_GetFrame()
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 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;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2096 return (PyObject *)current_frame;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2097 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2098
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2099 int
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2100 PyEval_GetRestricted()
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2101 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2102 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	2103 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	2104 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2105
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2106 void
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2107 Py_FlushLine()
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2108 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2109 PyObject *f = PySys_GetObject("stdout");
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2110 if (PyFile_SoftSpace(f, 0))
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2111 PyFile_WriteString("\n", f);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2112 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2113
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2114
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2115 /* XXX Many of the following operator implementations could be
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2116 replaced by calls into the 'abstract' module. */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2117
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2118 #define BINOP(opname, ropname, thisfunc) \
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2119 if (!PyInstance_Check(v) && !PyInstance_Check(w)) \
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2120 ; \
1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2121 else \
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2122 return PyInstance_DoBinOp(v, w, opname, ropname, thisfunc)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	2123
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	2124
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2125 static PyObject *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2126 or(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2127 PyObject v, w;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2128 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2129 BINOP("__or__", "__ror__", or);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2130 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2131 PyObject *x = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2132 PyObject * (f) Py_FPROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2133 if (PyNumber_Coerce(&v, &w) != 0)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2134 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2135 if ((f = v->ob_type->tp_as_number->nb_or) != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2136 x = (*f)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2137 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2138 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2139 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2140 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2141 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2142 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for \|");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2143 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2144 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2145
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2146 static PyObject *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2147 xor(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2148 PyObject v, w;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2149 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2150 BINOP("__xor__", "__rxor__", xor);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2151 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2152 PyObject *x = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2153 PyObject * (f) Py_FPROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2154 if (PyNumber_Coerce(&v, &w) != 0)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2155 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2156 if ((f = v->ob_type->tp_as_number->nb_xor) != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2157 x = (*f)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2158 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2159 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2160 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2161 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2162 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2163 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for ^");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2164 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2165 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2166
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2167 static PyObject *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2168 and(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2169 PyObject v, w;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2170 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2171 BINOP("__and__", "__rand__", and);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2172 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2173 PyObject *x = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2174 PyObject * (f) Py_FPROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2175 if (PyNumber_Coerce(&v, &w) != 0)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2176 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2177 if ((f = v->ob_type->tp_as_number->nb_and) != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2178 x = (*f)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2179 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2180 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2181 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2182 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2183 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2184 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for &");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2185 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2186 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2187
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2188 static PyObject *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2189 lshift(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2190 PyObject v, w;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2191 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2192 BINOP("__lshift__", "__rlshift__", lshift);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2193 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2194 PyObject *x = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2195 PyObject * (f) Py_FPROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2196 if (PyNumber_Coerce(&v, &w) != 0)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2197 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2198 if ((f = v->ob_type->tp_as_number->nb_lshift) != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2199 x = (*f)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2200 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2201 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2202 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2203 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2204 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2205 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for <<");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2206 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2207 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2208
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2209 static PyObject *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2210 rshift(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2211 PyObject v, w;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2212 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2213 BINOP("__rshift__", "__rrshift__", rshift);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2214 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2215 PyObject *x = NULL;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2216 PyObject * (f) Py_FPROTO((PyObject , PyObject *));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2217 if (PyNumber_Coerce(&v, &w) != 0)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2218 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2219 if ((f = v->ob_type->tp_as_number->nb_rshift) != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2220 x = (*f)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2221 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2222 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2223 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2224 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2225 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2226 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for >>");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2227 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2228 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2229
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2230 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2231 add(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2232 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2233 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2234 BINOP("__add__", "__radd__", add);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2235 if (v->ob_type->tp_as_sequence != NULL)
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2236 return (*v->ob_type->tp_as_sequence->sq_concat)(v, w);
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2237 else if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2238 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2239 if (PyNumber_Coerce(&v, &w) != 0)
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2240 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2241 x = (*v->ob_type->tp_as_number->nb_add)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2242 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2243 Py_DECREF(w);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2244 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2245 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2246 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for +");
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1181 diff changeset	2247 return NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2248 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2249
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2250 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2251 sub(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2252 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2253 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2254 BINOP("__sub__", "__rsub__", sub);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2255 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2256 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2257 if (PyNumber_Coerce(&v, &w) != 0)
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2258 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2259 x = (*v->ob_type->tp_as_number->nb_subtract)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2260 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2261 Py_DECREF(w);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2262 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2263 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2264 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for -");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2265 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2266 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2267
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2268 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2269 mul(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2270 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2271 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2272 PyTypeObject *tp;
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2273 tp = v->ob_type;
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2274 BINOP("__mul__", "__rmul__", mul);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2275 if (tp->tp_as_number != NULL &&
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2276 w->ob_type->tp_as_sequence != NULL &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2277 !PyInstance_Check(v)) {
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2278 /* numbersequence -- swap v and w /
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2279 PyObject *tmp = v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2280 v = w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2281 w = tmp;
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2282 tp = v->ob_type;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2283 }
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2284 if (tp->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2285 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2286 if (PyInstance_Check(v)) {
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2287 /* Instances of user-defined classes get their
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2288 other argument uncoerced, so they may
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2289 implement sequence*number as well as
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2290 numbernumber. /
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2291 Py_INCREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2292 Py_INCREF(w);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	2293 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2294 else if (PyNumber_Coerce(&v, &w) != 0)
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2295 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2296 x = (*v->ob_type->tp_as_number->nb_multiply)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2297 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2298 Py_DECREF(w);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2299 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2300 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2301 if (tp->tp_as_sequence != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2302 if (!PyInt_Check(w)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2303 PyErr_SetString(PyExc_TypeError,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2304 "can't multiply sequence with non-int");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2305 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2306 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2307 return (*tp->tp_as_sequence->sq_repeat)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2308 (v, (int)PyInt_AsLong(w));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2309 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2310 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for *");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2311 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2312 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2313
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2314 static PyObject *
88 16e8c5d16493 Change div() into divide(); div() is a Standard C function. Guido van Rossum <guido@python.org> parents: 86 diff changeset	2315 divide(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2316 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2317 {
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2318 BINOP("__div__", "__rdiv__", divide);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2319 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2320 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2321 if (PyNumber_Coerce(&v, &w) != 0)
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2322 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2323 x = (*v->ob_type->tp_as_number->nb_divide)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2324 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2325 Py_DECREF(w);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2326 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2327 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2328 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for /");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2329 return NULL;
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
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2332 static PyObject *
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2333 mod(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2334 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2335 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2336 if (PyString_Check(v)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2337 return PyString_Format(v, w);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2338 }
2088 1940e1e0cedf Use new instancebinop interface Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2339 BINOP("__mod__", "__rmod__", mod);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2340 if (v->ob_type->tp_as_number != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2341 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2342 if (PyNumber_Coerce(&v, &w) != 0)
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2343 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2344 x = (*v->ob_type->tp_as_number->nb_remainder)(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2345 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2346 Py_DECREF(w);
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2347 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	2348 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2349 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for %");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2350 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2351 }
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 static PyObject *
3694 581f073f071d Renamed static pow() to powerop() to avoid name conflict in some compilers. Guido van Rossum <guido@python.org> parents: 3610 diff changeset	2354 powerop(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2355 PyObject v, w;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2356 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2357 PyObject *res;
3694 581f073f071d Renamed static pow() to powerop() to avoid name conflict in some compilers. Guido van Rossum <guido@python.org> parents: 3610 diff changeset	2358 BINOP("__pow__", "__rpow__", powerop);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2359 if (v->ob_type->tp_as_number == NULL \|\|
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2360 w->ob_type->tp_as_number == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2361 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2362 "pow() requires numeric arguments");
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2363 return NULL;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2364 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2365 if (PyNumber_Coerce(&v, &w) != 0)
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2366 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2367 res = (*v->ob_type->tp_as_number->nb_power)(v, w, Py_None);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2368 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2369 Py_DECREF(w);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2370 return res;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2371 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	2372
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2373 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2374 neg(v)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2375 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2376 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2377 if (v->ob_type->tp_as_number != NULL)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2378 return (*v->ob_type->tp_as_number->nb_negative)(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2379 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for unary -");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2380 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2381 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2382
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2383 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2384 pos(v)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2385 PyObject *v;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2386 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2387 if (v->ob_type->tp_as_number != NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2388 return (*v->ob_type->tp_as_number->nb_positive)(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2389 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for unary +");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2390 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2391 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2392
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2393 static PyObject *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2394 invert(v)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2395 PyObject *v;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2396 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2397 PyObject * (f) Py_FPROTO((PyObject ));
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2398 if (v->ob_type->tp_as_number != NULL &&
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2399 (f = v->ob_type->tp_as_number->nb_invert) != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2400 return (*f)(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2401 PyErr_SetString(PyExc_TypeError, "bad operand type(s) for unary ~");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2402 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2403 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	2404
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2405 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2406 not(v)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2407 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2408 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2409 int outcome = PyObject_IsTrue(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2410 PyObject *w;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2411 if (outcome < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2412 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2413 if (outcome == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2414 w = Py_True;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2415 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2416 w = Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2417 Py_INCREF(w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2418 return w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2419 }
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1293 diff changeset	2420
6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1293 diff changeset	2421
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2422 /* External interface to call any callable object.
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2423 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	2424
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2425 PyObject *
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2426 PyEval_CallObject(func, arg)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2427 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2428 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	2429 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2430 return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2431 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2432
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2433 PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2434 PyEval_CallObjectWithKeywords(func, arg, kw)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2435 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2436 PyObject *arg;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2437 PyObject *kw;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2438 {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2439 ternaryfunc call;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2440 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2441
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2442 if (arg == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2443 arg = PyTuple_New(0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2444 else if (!PyTuple_Check(arg)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2445 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2446 "argument list must be a tuple");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2447 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2448 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2449 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2450 Py_INCREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2451
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2452 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	2453 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2454 "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	2455 return NULL;
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	2456 }
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	2457
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	2458 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	2459 result = (*call)(func, arg, kw);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2460 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	2461 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	2462 else
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2463 result = call_builtin(func, arg, kw);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2464
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2465 Py_DECREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2466
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2467 if (result == NULL && !PyErr_Occurred())
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2468 PyErr_SetString(PyExc_SystemError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2469 "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	2470
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2471 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	2472 }
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2473
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2474 static PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2475 call_builtin(func, arg, kw)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2476 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2477 PyObject *arg;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2478 PyObject *kw;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2479 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2480 if (PyCFunction_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2481 PyCFunction meth = PyCFunction_GetFunction(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2482 PyObject *self = PyCFunction_GetSelf(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2483 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	2484 if (!(flags & METH_VARARGS)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2485 int size = PyTuple_Size(arg);
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2486 if (size == 1)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2487 arg = PyTuple_GET_ITEM(arg, 0);
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2488 else if (size == 0)
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2489 arg = NULL;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2490 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2491 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	2492 return (*(PyCFunctionWithKeywords)meth)(self, arg, kw);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2493 if (kw != NULL && PyDict_Size(kw) != 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2494 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	2495 "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	2496 return NULL;
14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2497 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2498 return (*meth)(self, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2499 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2500 if (PyClass_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2501 return PyInstance_New(func, arg, kw);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2502 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2503 if (PyInstance_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2504 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	2505 if (call == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2506 PyErr_Clear();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2507 PyErr_SetString(PyExc_AttributeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2508 "no __call__ method defined");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2509 return NULL;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2510 }
2866 14111d66577d changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2844 diff changeset	2511 res = PyEval_CallObjectWithKeywords(call, arg, kw);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2512 Py_DECREF(call);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2513 return res;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2514 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2515 PyErr_SetString(PyExc_TypeError, "call of non-function");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2516 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2517 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2518
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2519 static PyObject *
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2520 call_function(func, arg, kw)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2521 PyObject *func;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2522 PyObject *arg;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2523 PyObject *kw;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2524 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2525 PyObject class = NULL; / == owner */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2526 PyObject *argdefs;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2527 PyObject d, k;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2528 int nk, nd;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2529 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2530
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2531 if (kw != NULL && !PyDict_Check(kw)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2532 PyErr_BadInternalCall();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2533 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2534 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2535
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2536 if (PyMethod_Check(func)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2537 PyObject *self = PyMethod_Self(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2538 class = PyMethod_Class(func);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2539 func = PyMethod_Function(func);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2540 if (self == NULL) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2541 /* 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	2542 the class (or a derived class) as first argument */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2543 if (PyTuple_Size(arg) >= 1) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2544 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	2545 if (self != NULL &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2546 PyInstance_Check(self) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2547 PyClass_IsSubclass((PyObject *)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2548 (((PyInstanceObject *)self)->in_class),
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2549 class))
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2550 /* Handy-dandy */ ;
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2551 else
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2552 self = NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2553 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2554 if (self == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2555 PyErr_SetString(PyExc_TypeError,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2556 "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	2557 return NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2558 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2559 Py_INCREF(arg);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2560 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2561 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2562 int argcount = PyTuple_Size(arg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2563 PyObject *newarg = PyTuple_New(argcount + 1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2564 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	2565 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	2566 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2567 Py_INCREF(self);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2568 PyTuple_SET_ITEM(newarg, 0, self);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2569 for (i = 0; i < argcount; i++) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2570 PyObject *v = PyTuple_GET_ITEM(arg, i);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2571 Py_XINCREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2572 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	2573 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2574 arg = newarg;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2575 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2576 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2577 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2578 if (!PyFunction_Check(func)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2579 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2580 "call of non-function");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2581 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2582 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2583 Py_INCREF(arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2584 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2585
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2586 argdefs = PyFunction_GetDefaults(func);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2587 if (argdefs != NULL && PyTuple_Check(argdefs)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2588 d = &PyTuple_GET_ITEM((PyTupleObject *)argdefs, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2589 nd = PyTuple_Size(argdefs);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2590 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2591 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2592 d = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2593 nd = 0;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2594 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2595
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2596 if (kw != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2597 int pos, i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2598 nk = PyDict_Size(kw);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2599 k = PyMem_NEW(PyObject , 2nk);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2600 if (k == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2601 PyErr_NoMemory();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2602 Py_DECREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2603 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2604 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2605 pos = i = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2606 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	2607 i += 2;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2608 nk = i/2;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2609 /* XXX This is broken if the caller deletes dict items! */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2610 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2611 else {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2612 k = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2613 nk = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2614 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2615
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2616 result = eval_code2(
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2617 (PyCodeObject *)PyFunction_GetCode(func),
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2618 PyFunction_GetGlobals(func), (PyObject *)NULL,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2619 &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	2620 k, nk,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2621 d, nd,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2622 class);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2623
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2624 Py_DECREF(arg);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2625 PyMem_XDEL(k);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2626
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2627 return result;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2628 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2629
3863 4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2630 #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	2631 "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	2632
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2633 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2634 apply_subscript(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2635 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2636 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2637 PyTypeObject *tp = v->ob_type;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2638 if (tp->tp_as_sequence == NULL && tp->tp_as_mapping == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2639 PyErr_SetString(PyExc_TypeError, "unsubscriptable object");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2640 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2641 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2642 if (tp->tp_as_mapping != NULL) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2643 return (*tp->tp_as_mapping->mp_subscript)(v, w);
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2644 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2645 else {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2646 int i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2647 if (!PyInt_Check(w)) {
3863 4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2648 if (PySlice_Check(w)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2649 PyErr_SetString(PyExc_ValueError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2650 SLICE_ERROR_MSG);
3863 4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2651 } else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2652 PyErr_SetString(PyExc_TypeError,
3863 4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2653 "sequence subscript not int");
4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2654 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2655 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2656 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2657 i = PyInt_AsLong(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2658 if (i < 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2659 int len = (*tp->tp_as_sequence->sq_length)(v);
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2660 if (len < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2661 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2662 i += len;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2663 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2664 return (*tp->tp_as_sequence->sq_item)(v, i);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2665 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2666 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2667
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2668 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2669 loop_subscript(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2670 PyObject v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2671 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2672 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	2673 int i;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2674 if (sq == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2675 PyErr_SetString(PyExc_TypeError, "loop over non-sequence");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2676 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2677 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2678 i = PyInt_AsLong(w);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2679 v = (*sq->sq_item)(v, i);
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2680 if (v)
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2681 return v;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2682 if (PyErr_Occurred() == PyExc_IndexError)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2683 PyErr_Clear();
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2684 return NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2685 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2686
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2687 static int
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2688 slice_index(v, pi)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2689 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2690 int *pi;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2691 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2692 if (v != NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2693 long x;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2694 if (!PyInt_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2695 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2696 "slice index must be int");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2697 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2698 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2699 x = PyInt_AsLong(v);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2700 /* 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	2701 if (x > INT_MAX)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2702 x = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2703 else if (x < -INT_MAX)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2704 x = 0;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2705 *pi = x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2706 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2707 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2708 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2709
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2710 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2711 apply_slice(u, v, w) /* return u[v:w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2712 PyObject u, v, *w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2713 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2714 int ilow = 0, ihigh = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2715 if (slice_index(v, &ilow) != 0)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2716 return NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2717 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	2718 return NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2719 return PySequence_GetSlice(u, ilow, ihigh);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2720 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2721
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2722 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2723 assign_subscript(w, key, v) /* w[key] = v */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2724 PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2725 PyObject *key;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2726 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2727 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2728 PyTypeObject *tp = w->ob_type;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2729 PySequenceMethods *sq;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2730 PyMappingMethods *mp;
2366 94bf2f05da31 fix bug in try-finally with class exceptions; declare different func pointers for different uses Guido van Rossum <guido@python.org> parents: 2338 diff changeset	2731 int (*func1)();
94bf2f05da31 fix bug in try-finally with class exceptions; declare different func pointers for different uses Guido van Rossum <guido@python.org> parents: 2338 diff changeset	2732 int (*func2)();
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2733 if ((mp = tp->tp_as_mapping) != NULL &&
2366 94bf2f05da31 fix bug in try-finally with class exceptions; declare different func pointers for different uses Guido van Rossum <guido@python.org> parents: 2338 diff changeset	2734 (func1 = mp->mp_ass_subscript) != NULL) {
94bf2f05da31 fix bug in try-finally with class exceptions; declare different func pointers for different uses Guido van Rossum <guido@python.org> parents: 2338 diff changeset	2735 return (*func1)(w, key, v);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2736 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2737 else if ((sq = tp->tp_as_sequence) != NULL &&
2366 94bf2f05da31 fix bug in try-finally with class exceptions; declare different func pointers for different uses Guido van Rossum <guido@python.org> parents: 2338 diff changeset	2738 (func2 = sq->sq_ass_item) != NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2739 if (!PyInt_Check(key)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2740 PyErr_SetString(PyExc_TypeError,
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2741 "sequence subscript must be integer (assign or del)");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2742 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2743 }
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2744 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2745 int i = PyInt_AsLong(key);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2746 if (i < 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2747 int len = (*sq->sq_length)(w);
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2748 if (len < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2749 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2750 i += len;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2751 }
2366 94bf2f05da31 fix bug in try-finally with class exceptions; declare different func pointers for different uses Guido van Rossum <guido@python.org> parents: 2338 diff changeset	2752 return (*func2)(w, i, v);
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2753 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2754 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2755 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2756 PyErr_SetString(PyExc_TypeError,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2757 "can't assign to this subscripted object");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2758 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2759 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2760 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2761
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2762 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2763 assign_slice(u, v, w, x) /* u[v:w] = x */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2764 PyObject u, v, w, x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2765 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2766 int ilow = 0, ihigh = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2767 if (slice_index(v, &ilow) != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2768 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2769 if (slice_index(w, &ihigh) != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2770 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2771 if (x == NULL)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2772 return PySequence_DelSlice(u, ilow, ihigh);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2773 else
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2774 return PySequence_SetSlice(u, ilow, ihigh, x);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2775 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2776
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2777 static int
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2778 cmp_exception(err, v)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2779 PyObject err, v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2780 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2781 if (PyTuple_Check(v)) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2782 int i, n;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2783 n = PyTuple_Size(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2784 for (i = 0; i < n; i++) {
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	2785 /* Test recursively */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2786 if (cmp_exception(err, PyTuple_GET_ITEM(v, i)))
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2787 return 1;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2788 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2789 return 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2790 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2791 if (PyClass_Check(v) && PyClass_Check(err))
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2792 return PyClass_IsSubclass(err, v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2793 return err == v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2794 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2795
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2796 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2797 cmp_member(v, w)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2798 PyObject v, w;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2799 {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2800 int i, cmp;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2801 PyObject *x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2802 PySequenceMethods *sq;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2803 /* Special case for char in string */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2804 if (PyString_Check(w)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2805 register char s, end;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2806 register char c;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2807 if (!PyString_Check(v) \|\| PyString_Size(v) != 1) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2808 PyErr_SetString(PyExc_TypeError,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2809 "string member test needs char left operand");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2810 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2811 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2812 c = PyString_AsString(v)[0];
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2813 s = PyString_AsString(w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2814 end = s + PyString_Size(w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2815 while (s < end) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2816 if (c == *s++)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2817 return 1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2818 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2819 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2820 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2821 sq = w->ob_type->tp_as_sequence;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2822 if (sq == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2823 PyErr_SetString(PyExc_TypeError,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2824 "'in' or 'not in' needs sequence right argument");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2825 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2826 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2827 for (i = 0; ; i++) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2828 x = (*sq->sq_item)(w, i);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2829 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2830 if (PyErr_Occurred() == PyExc_IndexError) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2831 PyErr_Clear();
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2832 break;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2833 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2834 return -1;
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2835 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2836 cmp = PyObject_Compare(v, x);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2837 Py_XDECREF(x);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2838 if (cmp == 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2839 return 1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2840 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2841 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2842 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2843
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2844 static PyObject *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2845 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	2846 int op;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2847 register PyObject *v;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2848 register PyObject *w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2849 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2850 register int cmp;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2851 register int res = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2852 switch (op) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2853 case IS:
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2854 case IS_NOT:
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2855 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	2856 if (op == (int) IS_NOT)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2857 res = !res;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2858 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2859 case IN:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2860 case NOT_IN:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2861 res = cmp_member(v, w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2862 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2863 return NULL;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2864 if (op == (int) NOT_IN)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2865 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2866 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2867 case EXC_MATCH:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2868 res = cmp_exception(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2869 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2870 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2871 cmp = PyObject_Compare(v, w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2872 switch (op) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2873 case LT: res = cmp < 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2874 case LE: res = cmp <= 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2875 case EQ: res = cmp == 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2876 case NE: res = cmp != 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2877 case GT: res = cmp > 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2878 case GE: res = cmp >= 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2879 /* XXX no default? (res is initialized to 0 though) */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2880 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2881 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2882 v = res ? Py_True : Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2883 Py_INCREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2884 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2885 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2886
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2887 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2888 import_from(locals, v, name)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2889 PyObject *locals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2890 PyObject *v;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2891 PyObject *name;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2892 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2893 PyObject w, x;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2894 if (!PyModule_Check(v)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2895 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2896 "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	2897 return -1;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2898 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2899 w = PyModule_GetDict(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2900 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	2901 int pos, err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2902 PyObject name, value;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2903 pos = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2904 while (PyDict_Next(w, &pos, &name, &value)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2905 if (!PyString_Check(name) \|\|
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2906 PyString_AsString(name)[0] == '_')
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2907 continue;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2908 Py_INCREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2909 err = PyDict_SetItem(locals, name, value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2910 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	2911 if (err != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2912 return -1;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2913 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2914 return 0;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2915 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2916 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2917 x = PyDict_GetItem(w, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2918 if (x == NULL) {
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2919 char buf[250];
661 7e5f4d9aee77 Limit length of name passed to sprintf. Guido van Rossum <guido@python.org> parents: 607 diff changeset	2920 sprintf(buf, "cannot import name %.230s",
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2921 PyString_AsString(name));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2922 PyErr_SetString(PyExc_ImportError, buf);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2923 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2924 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2925 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2926 return PyDict_SetItem(locals, name, x);
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2927 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2928 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2929
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2930 static PyObject *
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2931 build_class(methods, bases, name)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2932 PyObject methods; / dictionary */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2933 PyObject bases; / tuple containing classes */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2934 PyObject name; / string */
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2935 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2936 int i;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2937 if (!PyTuple_Check(bases)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2938 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2939 "build_class with non-tuple bases");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2940 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2941 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2942 if (!PyDict_Check(methods)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2943 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2944 "build_class with non-dictionary");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2945 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2946 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2947 if (!PyString_Check(name)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2948 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2949 "build_class witn non-string name");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2950 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2951 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2952 for (i = PyTuple_Size(bases); --i >= 0; ) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2953 PyObject *base = PyTuple_GET_ITEM(bases, i);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2954 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	2955 /* 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	2956 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	2957 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	2958 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	2959 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	2960 if (base->ob_type->ob_type->tp_call) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2961 PyObject *args;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2962 PyObject *class;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2963 args = Py_BuildValue("(OOO)",
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2964 name, bases, methods);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2965 class = PyEval_CallObject(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2966 (PyObject *)base->ob_type, args);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2967 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	2968 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	2969 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2970 PyErr_SetString(PyExc_TypeError,
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2971 "base is not a class object");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2972 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2973 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2974 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2975 return PyClass_New(bases, methods, name);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2976 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2977
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2978 static int
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2979 exec_statement(f, prog, globals, locals)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2980 PyFrameObject *f;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2981 PyObject *prog;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2982 PyObject *globals;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2983 PyObject *locals;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2984 {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2985 char *s;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2986 int n;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2987 PyObject *v;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2988 int plain = 0;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2989
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2990 if (PyTuple_Check(prog) && globals == Py_None && locals == Py_None &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2991 ((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	2992 /* Backward compatibility hack */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2993 globals = PyTuple_GetItem(prog, 1);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2994 if (n == 3)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2995 locals = PyTuple_GetItem(prog, 2);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2996 prog = PyTuple_GetItem(prog, 0);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2997 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2998 if (globals == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2999 globals = PyEval_GetGlobals();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3000 if (locals == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3001 locals = PyEval_GetLocals();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3002 plain = 1;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3003 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3004 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3005 else if (locals == Py_None)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3006 locals = globals;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3007 if (!PyString_Check(prog) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3008 !PyCode_Check(prog) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3009 !PyFile_Check(prog)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3010 PyErr_SetString(PyExc_TypeError,
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3011 "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	3012 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3013 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3014 if (!PyDict_Check(globals) \|\| !PyDict_Check(locals)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3015 PyErr_SetString(PyExc_TypeError,
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3016 "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	3017 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3018 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3019 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	3020 PyDict_SetItemString(globals, "__builtins__", f->f_builtins);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3021 if (PyCode_Check(prog)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3022 if (PyEval_EvalCode((PyCodeObject *) prog,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3023 globals, locals) == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3024 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3025 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3026 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3027 if (PyFile_Check(prog)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3028 FILE *fp = PyFile_AsFile(prog);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3029 char *name = PyString_AsString(PyFile_Name(prog));
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3030 if (PyRun_File(fp, name, file_input, globals, locals) == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3031 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3032 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3033 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3034 s = PyString_AsString(prog);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3035 if (strlen(s) != PyString_Size(prog)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3036 PyErr_SetString(PyExc_ValueError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3037 "embedded '\\0' in exec string");
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3038 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3039 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3040 v = PyRun_String(s, file_input, globals, locals);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3041 if (v == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3042 return -1;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3043 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3044 if (plain)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3045 PyFrame_LocalsToFast(f, 0);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3046 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3047 }
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3048
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	3049 /* Hack for ni.py */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3050 static PyObject *
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3051 find_from_args(f, nexti)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3052 PyFrameObject *f;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3053 int nexti;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3054 {
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3055 int opcode;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3056 int oparg;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3057 PyObject list, name;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3058 unsigned char *next_instr;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3059
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3060 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	3061 opcode = (*next_instr++);
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3062 if (opcode != IMPORT_FROM) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3063 Py_INCREF(Py_None);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3064 return Py_None;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3065 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3066
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3067 list = PyList_New(0);
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3068 if (list == NULL)
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3069 return NULL;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3070
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3071 do {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3072 oparg = (next_instr[1]<<8) + next_instr[0];
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3073 next_instr += 2;
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3074 name = Getnamev(f, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3075 if (PyList_Append(list, name) < 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3076 Py_DECREF(list);
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3077 break;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3078 }
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3079 opcode = (*next_instr++);
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3080 } while (opcode == IMPORT_FROM);
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3081
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3082 return list;
4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3083 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3084
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3085
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3086 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3087
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3088 PyObject *
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3089 getarray(a)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3090 long a[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3091 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3092 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3093 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	3094 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	3095 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	3096 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	3097 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3098 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3099 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3100 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3101 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	3102 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3103 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	3104 a[i] = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3105 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3106 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3107
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3108 PyObject *
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3109 _Py_GetDXProfile(self, args)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3110 PyObject self, args;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3111 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3112 #ifndef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3113 return getarray(dxp);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3114 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3115 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3116 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	3117 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	3118 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	3119 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	3120 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3121 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3122 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3123 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3124 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	3125 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3126 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3127 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3128 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3129
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3130 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 5405:b7871ca930ad legacy-trunk