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

annotate Python/ceval.c @ 1356:043da19302ef legacy-trunk

Several optimizations and speed improvements. cstubs: Use Matrix type instead of float[4][4].

author	Sjoerd Mullender <sjoerd@acm.org>
date	Fri, 22 Oct 1993 12:04:32 +0000
parents	fccd415e2eb8
children	7c3245c18677

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	1 /***********************************************************
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1181 diff changeset	2 Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1181 diff changeset	3 Amsterdam, 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
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	7 Permission to use, copy, modify, and distribute this software and its
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	8 documentation for any purpose and without fee is hereby granted,
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
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	10 both that copyright notice and this permission notice appear in
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	12 Centrum or CWI not be used in advertising or publicity pertaining to
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	13 distribution of the software without specific, written prior permission.
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	14
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	15 STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	16 THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	17 FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	18 FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	19 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	20 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	21 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	22
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	23 ******************************************************************/
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	24
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	25 /* Execute compiled code */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	26
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	27 #include "allobjects.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	28
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	29 #include "import.h"
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	30 #include "sysmodule.h"
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 #include "compile.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	32 #include "frameobject.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	33 #include "eval.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	34 #include "ceval.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	35 #include "opcode.h"
119 9fee1ca6c8fe File name shortening. Guido van Rossum <guido@python.org> parents: 88 diff changeset	36 #include "bltinmodule.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	37 #include "traceback.h"
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	38 #include "graminit.h"
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	39 #include "pythonrun.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	40
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	41 /* Turn this on if your compiler chokes on the big switch: */
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	42 /* #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	43
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	44 /* Turn this on if you want to debug the interpreter: */
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	45 /* (This can be on even if NDEBUG is defined) */
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	46 /* #define DEBUG 1 /**/
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	47
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	48 #if defined(DEBUG) \|\| !defined(NDEBUG)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	49 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	50 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	51 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	52 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	54 /* Global option, may be set by main() */
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	55 int killprint;
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	56
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	57
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	58 /* Forward declarations */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	59
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	60 #ifdef LLTRACE
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	61 static int prtrace PROTO((object , char ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	62 #endif
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	63 static void call_exc_trace PROTO((object , object, frameobject *));
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	64 static int call_trace
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	65 PROTO((object , object , frameobject , char , object *));
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	66 static object add PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	67 static object sub PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	68 static object mul PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	69 static object divide PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	70 static object rem PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	71 static object neg PROTO((object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	72 static object pos PROTO((object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	73 static object not PROTO((object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	74 static object invert PROTO((object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	75 static object lshift PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	76 static object rshift PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	77 static object and PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	78 static object xor PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	79 static object or PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	80 static object call_builtin PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	81 static object call_function PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	82 static object apply_subscript PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	83 static object loop_subscript PROTO((object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	84 static int slice_index PROTO((object , int, int ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	85 static object apply_slice PROTO((object , object , object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	86 static int assign_subscript PROTO((object , object , object *));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	87 static int assign_slice PROTO((object , object , object , object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	88 static int cmp_exception PROTO((object , object ));
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	89 static int cmp_member PROTO((object , object ));
802 3d6541a2eca5 Arg of cmp_outcome becomes an int for portability to the Mac Guido van Rossum <guido@python.org> parents: 789 diff changeset	90 static object cmp_outcome PROTO((int, object , object *));
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	91 static int import_from PROTO((object , object , object *));
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	92 static object build_class PROTO((object , object , object ));
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	93 static void locals_2_fast PROTO((frameobject *, int));
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	94 static void fast_2_locals PROTO((frameobject *));
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	95 static int access_statement PROTO((object , object , frameobject *));
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	96 static int exec_statement PROTO((object , object , object *));
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	97
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	98
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	99 /* Pointer to current frame, used to link new frames to */
6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	100
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	101 static frameobject *current_frame;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	102
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	103 #ifdef USE_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	104
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	105 #include <errno.h>
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	106 #include "thread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	107
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	108 static type_lock interpreter_lock;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	109
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	110 void
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	111 init_save_thread()
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	112 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	113 if (interpreter_lock)
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	114 return;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	115 interpreter_lock = allocate_lock();
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	116 acquire_lock(interpreter_lock, 1);
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	117 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	118
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	119 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	120
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	121 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	122 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	123 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	124
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	125 object *
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	126 save_thread()
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	127 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	128 #ifdef USE_THREAD
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	129 if (interpreter_lock) {
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	130 object *res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	131 res = (object *)current_frame;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	132 current_frame = NULL;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	133 release_lock(interpreter_lock);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	134 return res;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	135 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	136 #endif
1271 2919b448e385 * Microscopic corrections to make things compile on the Cray APP. Guido van Rossum <guido@python.org> parents: 1263 diff changeset	137 return NULL;
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
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	140 void
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	141 restore_thread(x)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	142 object *x;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	143 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	144 #ifdef USE_THREAD
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	145 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	146 int err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	147 err = errno;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	148 acquire_lock(interpreter_lock, 1);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	149 errno = err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	150 current_frame = (frameobject *)x;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	151 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	152 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	153 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	154
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	155
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	156 /* 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	157
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	158 enum why_code {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	159 WHY_NOT, /* No error */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	160 WHY_EXCEPTION, /* Exception occurred */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	161 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	162 WHY_RETURN, /* 'return' statement */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	163 WHY_BREAK /* 'break' statement */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	164 };
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	165
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	166
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	167 /* Interpreter main loop */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	168
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	169 object *
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	170 eval_code(co, globals, locals, owner, arg)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	171 codeobject *co;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	172 object *globals;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	173 object *locals;
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	174 object *owner;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	175 object *arg;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	176 {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	177 register unsigned char *next_instr;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	178 register int opcode; /* Current opcode */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	179 register int oparg; /* Current opcode argument, if any */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	180 register object **stack_pointer;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	181 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	182 register int err; /* Error status -- nonzero if error */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	183 register object x; / Result object -- NULL if error */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	184 register object v; / Temporary objects popped off stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	185 register object *w;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	186 register object *u;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	187 register object *t;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	188 register frameobject f; / Current frame */
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	189 register listobject *fastlocals = NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	190 object trace = NULL; / Trace function or NULL */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	191 object retval; / Return value iff why == WHY_RETURN */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	192 char name; / Name used by some instructions */
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	193 int needmerge = 0; /* Set if need to merge locals back at end */
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	194 int defmode = 0; /* Default access mode for new variables */
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	195 #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	196 int lltrace;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	197 #endif
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	198 #ifdef DEBUG
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	199 /* Make it easier to find out where we are with dbx */
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	200 char *filename = getstringvalue(co->co_filename);
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	201 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	202
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	203 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	204
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	205 #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	206 #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	207 #define GETNAMEV(i) Getnamev(f, i)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	208 #define FIRST_INSTR() (GETUSTRINGVALUE(f->f_code->co_code))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	209 #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	210 #define NEXTOP() (*next_instr++)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	211 #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	212 #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	213 #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	214
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	215 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	216
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	217 #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	218 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	219 #define TOP() (stack_pointer[-1])
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	220 #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	221 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	222
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	223 #define CHECK_STACK(n) (STACK_LEVEL() + (n) < f->f_nvalues \|\| \
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	224 (stack_pointer = extend_stack(f, STACK_LEVEL(), n)))
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	225
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	226 #ifdef LLTRACE
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	227 #define PUSH(v) (BASIC_PUSH(v), lltrace && prtrace(TOP(), "push"))
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	228 #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	229 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	230 #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	231 #define POP() BASIC_POP()
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	232 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	233
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	234 if (globals == NULL) {
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	235 globals = getglobals();
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	236 if (locals == NULL) {
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	237 locals = getlocals();
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	238 needmerge = 1;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	239 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	240 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	241 else {
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	242 if (locals == NULL)
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	243 locals = globals;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	244 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	245
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	246 #ifdef LLTRACE
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	247 lltrace = dictlookup(globals, "__lltrace__") != NULL;
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	248 #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	249
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	250 f = newframeobject(
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	251 current_frame, /back/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	252 co, /code/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	253 globals, /globals/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	254 locals, /locals/
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	255 owner, /owner/
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	256 50, /nvalues/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	257 20); /nblocks/
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	258 if (f == NULL)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	259 return NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	260
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	261 current_frame = f;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	262
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	263 if (sys_trace != NULL) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	264 /* sys_trace, if defined, is a function that will
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	265 be called on every entry to a code block.
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	266 Its return value, if not None, is a function that
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	267 will be called at the start of each executed line
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	268 of code. (Actually, the function must return
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	269 itself in order to continue tracing.)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	270 The trace functions are called with three arguments:
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	271 a pointer to the current frame, a string indicating
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	272 why the function is called, and an argument which
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	273 depends on the situation. The global trace function
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	274 (sys.trace) is also called whenever an exception
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	275 is detected. */
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	276 if (call_trace(&sys_trace, &trace, f, "call", arg)) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	277 /* Trace function raised an error */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	278 current_frame = f->f_back;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	279 DECREF(f);
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	280 return NULL;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	281 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	282 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	283
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	284 if (sys_profile != NULL) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	285 /* Similar for sys_profile, except it needn't return
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	286 itself and isn't called for "line" events */
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	287 if (call_trace(&sys_profile, (object**)0, f, "call", arg)) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	288 current_frame = f->f_back;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	289 DECREF(f);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	290 return NULL;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	291 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	292 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	293
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	294 next_instr = GETUSTRINGVALUE(f->f_code->co_code);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	295 stack_pointer = f->f_valuestack;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	296
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	297 if (arg != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	298 INCREF(arg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	299 PUSH(arg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	300 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	301
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	302 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	303 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	304 x = None; /* Not a reference, just anything non-NULL */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	305
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	306 for (;;) {
237 16f467717d7a Declare ticker as int; made testbool generic for all numeric types Guido van Rossum <guido@python.org> parents: 224 diff changeset	307 static int ticker;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	308
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	309 /* Do periodic things.
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	310 Doing this every time through the loop would add
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	311 too much overhead (a function call per instruction).
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	312 So we do it only every tenth instruction. */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	313
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	314 if (--ticker < 0) {
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	315 ticker = 10;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	316 if (intrcheck()) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	317 err_set(KeyboardInterrupt);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	318 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	319 goto on_error;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	320 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	321
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	322 #ifdef USE_THREAD
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	323 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	324 /* Give another thread a chance */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	325
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	326 current_frame = NULL;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	327 release_lock(interpreter_lock);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	328
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	329 /* Other threads may run now */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	330
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	331 acquire_lock(interpreter_lock, 1);
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	332 current_frame = f;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	333 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	334 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	335 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	336
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	337 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	338
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	339 #ifdef DEBUG
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	340 f->f_lasti = INSTR_OFFSET();
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	341 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	342
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	343 opcode = NEXTOP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	344 if (HAS_ARG(opcode))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	345 oparg = NEXTARG();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	346
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	347 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	348 /* Instruction tracing */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	349
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	350 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	351 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	352 printf("%d: %d, %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	353 (int) (INSTR_OFFSET() - 3),
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	354 opcode, oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	355 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	356 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	357 printf("%d: %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	358 (int) (INSTR_OFFSET() - 1), opcode);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	359 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	360 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	361 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	362
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	363 if (!CHECK_STACK(3)) {
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	364 x = NULL;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	365 break;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	366 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	367
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	368 /* Main switch on opcode */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	369
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	370 switch (opcode) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	371
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	372 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	373 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	374 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	375 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	376
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	377 /* 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	378
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	379 case POP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	380 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	381 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	382 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	383
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	384 case ROT_TWO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	385 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	386 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	387 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	388 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	389 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	390
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	391 case ROT_THREE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	392 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	393 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	394 x = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	395 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	396 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	397 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	398 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	399
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	400 case DUP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	401 v = TOP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	402 INCREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	403 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	404 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	405
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	406 case UNARY_POSITIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	407 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	408 x = pos(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	409 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	410 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	411 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	412
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	413 case UNARY_NEGATIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	414 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	415 x = neg(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	416 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	417 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	418 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	419
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	420 case UNARY_NOT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	421 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	422 x = not(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	423 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	424 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	425 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	426
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	427 case UNARY_CONVERT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	428 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	429 x = reprobject(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	430 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	431 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	432 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	433
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	434 case UNARY_CALL:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	435 v = POP();
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	436 f->f_lasti = INSTR_OFFSET() - 1; /* For tracing */
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	437 x = call_object(v, (object *)NULL);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	438 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	439 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	440 break;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	441
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	442 case UNARY_INVERT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	443 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	444 x = invert(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	445 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	446 PUSH(x);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	447 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	448
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	449 case BINARY_MULTIPLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	450 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	451 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	452 x = mul(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	453 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	454 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	455 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	456 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	457
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	458 case BINARY_DIVIDE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	459 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	460 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	461 x = divide(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	462 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	463 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	464 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	465 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	466
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	467 case BINARY_MODULO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	468 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	469 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	470 x = rem(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	471 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	472 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	473 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	474 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	475
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	476 case BINARY_ADD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	477 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	478 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	479 x = add(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	480 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	481 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	482 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	483 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	484
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	485 case BINARY_SUBTRACT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	486 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	487 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	488 x = sub(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	489 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	490 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	491 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	492 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	493
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	494 case BINARY_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	495 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	496 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	497 x = apply_subscript(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	498 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	499 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	500 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	501 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	502
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	503 case BINARY_CALL:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	504 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	505 v = POP();
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	506 f->f_lasti = INSTR_OFFSET() - 1; /* For tracing */
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	507 x = call_object(v, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	508 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	509 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	510 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	511 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	512
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	513 case BINARY_LSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	514 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	515 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	516 x = lshift(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	517 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	518 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	519 PUSH(x);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	520 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	521
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	522 case BINARY_RSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	523 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	524 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	525 x = rshift(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	526 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	527 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	528 PUSH(x);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	529 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	530
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	531 case BINARY_AND:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	532 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	533 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	534 x = and(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	535 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	536 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	537 PUSH(x);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	538 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	539
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	540 case BINARY_XOR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	541 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	542 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	543 x = xor(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	544 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	545 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	546 PUSH(x);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	547 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	548
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	549 case BINARY_OR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	550 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	551 v = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	552 x = or(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	553 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	554 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	555 PUSH(x);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	556 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	557
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	558 case SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	559 case SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	560 case SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	561 case SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	562 if ((opcode-SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	563 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	564 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	565 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	566 if ((opcode-SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	567 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	568 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	569 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	570 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	571 x = apply_slice(u, v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	572 DECREF(u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	573 XDECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	574 XDECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	575 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	576 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	577
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	578 case STORE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	579 case STORE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	580 case STORE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	581 case STORE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	582 if ((opcode-STORE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	583 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	584 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	585 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	586 if ((opcode-STORE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	587 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	588 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	589 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	590 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	591 t = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	592 err = assign_slice(u, v, w, t); /* u[v:w] = t */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	593 DECREF(t);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	594 DECREF(u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	595 XDECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	596 XDECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	597 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	598
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	599 case DELETE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	600 case DELETE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	601 case DELETE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	602 case DELETE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	603 if ((opcode-DELETE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	604 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	605 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	606 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	607 if ((opcode-DELETE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	608 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	609 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	610 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	611 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	612 err = assign_slice(u, v, w, (object *)NULL);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	613 /* del u[v:w] */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	614 DECREF(u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	615 XDECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	616 XDECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	617 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	618
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	619 case STORE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	620 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	621 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	622 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	623 /* v[w] = u */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	624 err = assign_subscript(v, w, u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	625 DECREF(u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	626 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	627 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	628 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	629
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	630 case DELETE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	631 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	632 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	633 /* del v[w] */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	634 err = assign_subscript(v, w, (object *)NULL);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	635 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	636 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	637 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	638
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	639 case PRINT_EXPR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	640 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	641 /* Print value except if procedure result */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	642 if (v != None) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	643 flushline();
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	644 x = sysget("stdout");
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	645 softspace(x, 1);
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	646 err = writeobject(v, x, 0);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	647 flushline();
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	648 if (killprint) {
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	649 err_setstr(RuntimeError,
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	650 "printing expression statement");
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	651 x = 0;
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	652 }
173 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 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	655 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	656
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	657 case PRINT_ITEM:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	658 v = POP();
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	659 w = sysget("stdout");
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	660 if (softspace(w, 1))
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	661 writestring(" ", w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	662 if (is_stringobject(v)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	663 char *s = getstringvalue(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	664 int len = getstringsize(v);
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	665 err = writeobject(v, w, PRINT_RAW);
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	666 if (err == 0 && len > 0 && s[len-1] == '\n')
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	667 softspace(w, 0);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	668 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	669 else {
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	670 err = writeobject(v, w, 0);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	671 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	672 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	673 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	674
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	675 case PRINT_NEWLINE:
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	676 x = sysget("stdout");
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	677 if (x == NULL)
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	678 err_setstr(RuntimeError, "lost sys.stdout");
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	679 else {
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	680 writestring("\n", x);
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	681 softspace(x, 0);
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	682 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	683 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	684
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	685 case BREAK_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	686 why = WHY_BREAK;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	687 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	688
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	689 case RAISE_EXCEPTION:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	690 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	691 w = POP();
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	692 /* A tuple is equivalent to its first element here */
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	693 while (is_tupleobject(w)) {
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	694 u = w;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	695 w = gettupleitem(u, 0);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	696 DECREF(u);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	697 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	698 if (!is_stringobject(w))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	699 err_setstr(TypeError,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	700 "exceptions must be strings");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	701 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	702 err_setval(w, v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	703 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	704 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	705 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	706 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	707
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	708 case LOAD_LOCALS:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	709 v = f->f_locals;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	710 INCREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	711 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	712 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	713
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	714 case RETURN_VALUE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	715 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	716 why = WHY_RETURN;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	717 break;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	718
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	719 case LOAD_GLOBALS:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	720 v = f->f_locals;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	721 INCREF(v);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	722 PUSH(v);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	723 break;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	724
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	725 case EXEC_STMT:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	726 w = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	727 v = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	728 u = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	729 err = exec_statement(u, v, w);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	730 DECREF(u);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	731 DECREF(v);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	732 DECREF(w);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	733 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	734
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	735 case BUILD_FUNCTION:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	736 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	737 x = newfuncobject(v, f->f_globals);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	738 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	739 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	740 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	741
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	742 case POP_BLOCK:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	743 {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	744 block *b = pop_block(f);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	745 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	746 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	747 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	748 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	749 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	750 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	751
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	752 case END_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	753 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	754 if (is_intobject(v)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	755 why = (enum why_code) getintvalue(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	756 if (why == WHY_RETURN)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	757 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	758 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	759 else if (is_stringobject(v)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	760 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	761 err_setval(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	762 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	763 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	764 tb_store(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	765 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	766 why = WHY_RERAISE;
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 else if (v != None) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	769 err_setstr(SystemError,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	770 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	771 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	772 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	773 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	774 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	775
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	776 case BUILD_CLASS:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	777 u = POP();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	778 v = POP();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	779 w = POP();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	780 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	781 PUSH(x);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	782 DECREF(u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	783 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	784 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	785 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	786
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	787 case STORE_NAME:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	788 w = GETNAMEV(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	789 v = POP();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	790 u = dict2lookup(f->f_locals, w);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	791 if (u == NULL) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	792 if (defmode != 0) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	793 if (v != None)
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	794 u = (object *)v->ob_type;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	795 else
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	796 u = NULL;
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	797 x = newaccessobject(v, f->f_locals,
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	798 (typeobject *)u,
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	799 defmode);
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	800 DECREF(v);
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	801 if (x == NULL)
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	802 break;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	803 v = x;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	804 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	805 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	806 else if (is_accessobject(u)) {
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	807 err = setaccessvalue(u, f->f_locals, v);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	808 DECREF(v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	809 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	810 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	811 err = dict2insert(f->f_locals, w, v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	812 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	813 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	814
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	815 case DELETE_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	816 w = GETNAMEV(oparg);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	817 u = dict2lookup(f->f_locals, w);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	818 if (u != NULL && is_accessobject(u)) {
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	819 err = setaccessvalue(u, f->f_locals,
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	820 (object *)NULL);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	821 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	822 }
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	823 if ((err = dict2remove(f->f_locals, w)) != 0)
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1354 diff changeset	824 err_setval(NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	825 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	826
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	827 #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	828 default: switch (opcode) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	829 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	830
581 bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	831 case UNPACK_VARARG:
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	832 if (EMPTY()) {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	833 err_setstr(TypeError,
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	834 "no argument list");
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	835 why = WHY_EXCEPTION;
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	836 break;
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	837 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	838 v = POP();
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	839 if (!is_tupleobject(v)) {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	840 err_setstr(TypeError,
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	841 "bad argument list");
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	842 why = WHY_EXCEPTION;
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	843 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	844 else if (gettuplesize(v) < oparg) {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	845 err_setstr(TypeError,
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	846 "not enough arguments");
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	847 why = WHY_EXCEPTION;
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	848 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	849 else if (oparg == 0) {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	850 PUSH(v);
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	851 break;
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	852 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	853 else {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	854 x = gettupleslice(v, oparg, gettuplesize(v));
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	855 if (x != NULL) {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	856 PUSH(x);
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	857 if (!CHECK_STACK(oparg)) {
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	858 x = NULL;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	859 break;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	860 }
581 bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	861 for (; --oparg >= 0; ) {
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	862 w = gettupleitem(v, oparg);
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	863 INCREF(w);
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	864 PUSH(w);
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	865 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	866 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	867 }
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	868 DECREF(v);
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	869 break;
bae1494f2ec8 Added UNPACK_VARARG code. Guido van Rossum <guido@python.org> parents: 567 diff changeset	870
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	871 case UNPACK_ARG:
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	872 {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	873 int n;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	874 if (EMPTY()) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	875 err_setstr(TypeError,
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	876 "no argument list");
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	877 why = WHY_EXCEPTION;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	878 break;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	879 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	880 v = POP();
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	881 if (!is_tupleobject(v)) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	882 err_setstr(TypeError,
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	883 "bad argument list");
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	884 why = WHY_EXCEPTION;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	885 break;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	886 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	887 n = gettuplesize(v);
1207 b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1198 diff changeset	888 #ifdef COMPAT_HACKS
b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1198 diff changeset	889 /* Implement various compatibility hacks (for 0.9.4 or earlier):
b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1198 diff changeset	890 (a) f(a,b,...) accepts f((1,2,...))
b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1198 diff changeset	891 (b) f((a,b,...)) accepts f(1,2,...)
b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1198 diff changeset	892 (c) f(self,(a,b,...)) accepts f(x,1,2,...)
b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1198 diff changeset	893 */
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	894 if (n == 1 && oparg != 1) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	895 /* Rule (a) */
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	896 w = gettupleitem(v, 0);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	897 if (is_tupleobject(w)) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	898 INCREF(w);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	899 DECREF(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	900 v = w;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	901 n = gettuplesize(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	902 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	903 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	904 else if (n != 1 && oparg == 1) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	905 /* Rule (b) */
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	906 PUSH(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	907 break;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	908 /* Don't fall through */
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	909 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	910 else if (n > 2 && oparg == 2) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	911 /* Rule (c) */
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	912 int i;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	913 w = newtupleobject(n-1);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	914 u = newtupleobject(2);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	915 if (u == NULL \|\| w == NULL) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	916 XDECREF(w);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	917 XDECREF(u);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	918 DECREF(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	919 why = WHY_EXCEPTION;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	920 break;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	921 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	922 t = gettupleitem(v, 0);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	923 INCREF(t);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	924 settupleitem(u, 0, t);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	925 for (i = 1; i < n; i++) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	926 t = gettupleitem(v, i);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	927 INCREF(t);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	928 settupleitem(w, i-1, t);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	929 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	930 settupleitem(u, 1, w);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	931 DECREF(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	932 v = u;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	933 n = 2;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	934 }
1132 6461dac9a9f2 * mymalloc.h: always allocate one extra byte, since some malloc's Guido van Rossum <guido@python.org> parents: 1096 diff changeset	935 #endif /* Disabled compatibility hacks */
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	936 if (n != oparg) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	937 err_setstr(TypeError,
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	938 "arg count mismatch");
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	939 why = WHY_EXCEPTION;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	940 DECREF(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	941 break;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	942 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	943 PUSH(v);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	944 }
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	945 /* Fall through */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	946 case UNPACK_TUPLE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	947 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	948 if (!is_tupleobject(v)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	949 err_setstr(TypeError, "unpack non-tuple");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	950 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	951 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	952 else if (gettuplesize(v) != oparg) {
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	953 err_setstr(ValueError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	954 "unpack tuple of wrong size");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	955 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	956 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	957 else {
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	958 if (!CHECK_STACK(oparg)) {
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	959 x = NULL;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	960 break;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	961 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	962 for (; --oparg >= 0; ) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	963 w = gettupleitem(v, oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	964 INCREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	965 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	966 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	967 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	968 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	969 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	970
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	971 case UNPACK_LIST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	972 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	973 if (!is_listobject(v)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	974 err_setstr(TypeError, "unpack non-list");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	975 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	976 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	977 else if (getlistsize(v) != oparg) {
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	978 err_setstr(ValueError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	979 "unpack list of wrong size");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	980 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	981 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	982 else {
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	983 if (!CHECK_STACK(oparg)) {
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	984 x = NULL;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	985 break;
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	986 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	987 for (; --oparg >= 0; ) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	988 w = getlistitem(v, oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	989 INCREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	990 PUSH(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	991 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	992 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	993 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	994 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	995
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	996 case STORE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	997 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	998 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	999 u = POP();
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1000 err = setattro(v, w, u); /* v.w = u */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1001 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1002 DECREF(u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1003 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1004
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1005 case DELETE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1006 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1007 v = POP();
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1008 err = setattro(v, w, (object )NULL); / del v.w */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1009 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1010 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1011
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1012 case STORE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1013 w = GETNAMEV(oparg);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1014 v = POP();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1015 u = dict2lookup(f->f_locals, w);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1016 if (u != NULL && is_accessobject(u)) {
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	1017 err = setaccessvalue(u, f->f_globals, v);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1018 DECREF(v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1019 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1020 }
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1021 err = dict2insert(f->f_globals, w, v);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1022 DECREF(v);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1023 break;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1024
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1025 case DELETE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1026 w = GETNAMEV(oparg);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1027 u = dict2lookup(f->f_locals, w);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1028 if (u != NULL && is_accessobject(u)) {
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	1029 err = setaccessvalue(u, f->f_globals,
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1030 (object *)NULL);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1031 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1032 }
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1033 if ((err = dict2remove(f->f_globals, w)) != 0)
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1354 diff changeset	1034 err_setval(NameError, w);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1035 break;
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1036
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1037 case LOAD_CONST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1038 x = GETCONST(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1039 INCREF(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1040 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1041 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1042
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1043 case LOAD_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1044 w = GETNAMEV(oparg);
449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1045 x = dict2lookup(f->f_locals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1046 if (x == NULL) {
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1047 err_clear();
449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1048 x = dict2lookup(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1049 if (x == NULL) {
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1050 err_clear();
449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1051 x = getbuiltin(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1052 if (x == NULL) {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1354 diff changeset	1053 err_setval(NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1054 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1055 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1056 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1057 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1058 if (is_accessobject(x)) {
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	1059 x = getaccessvalue(x, f->f_globals /* XXX */);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1060 if (x == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1061 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1062 }
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1063 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1064 INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1065 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1066 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1067
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1068 case LOAD_GLOBAL:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1069 w = GETNAMEV(oparg);
449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1070 x = dict2lookup(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1071 if (x == NULL) {
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1072 err_clear();
449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1073 x = getbuiltin(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1074 if (x == NULL) {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1354 diff changeset	1075 err_setval(NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1076 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1077 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1078 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1079 if (is_accessobject(x)) {
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	1080 x = getaccessvalue(x, f->f_globals);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1081 if (x == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1082 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1083 }
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1084 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1085 INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1086 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1087 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1088
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1089 case LOAD_LOCAL:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1090 w = GETNAMEV(oparg);
449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1091 x = dict2lookup(f->f_locals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1092 if (x == NULL) {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1354 diff changeset	1093 err_setval(NameError, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1094 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1095 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1096 if (is_accessobject(x)) {
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	1097 x = getaccessvalue(x, f->f_locals);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1098 if (x == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1099 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1100 }
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1101 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1102 INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1103 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1104 break;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1105
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1106 case RESERVE_FAST:
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1107 x = GETCONST(oparg);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1108 if (x == None)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1109 break;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1110 if (x == NULL \|\| !is_dictobject(x)) {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1111 fatal("bad RESERVE_FAST");
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1112 err_setstr(SystemError, "bad RESERVE_FAST");
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1113 x = NULL;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1114 break;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1115 }
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1116 XDECREF(f->f_fastlocals);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1117 XDECREF(f->f_localmap);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1118 INCREF(x);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1119 f->f_localmap = x;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1120 f->f_fastlocals = x = newlistobject(
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1121 x->ob_type->tp_as_mapping->mp_length(x));
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1122 fastlocals = (listobject *) x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1123 break;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1124
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1125 case LOAD_FAST:
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1126 x = GETLISTITEM(fastlocals, oparg);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1127 if (x == NULL) {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1128 err_setstr(NameError,
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1129 "undefined local variable");
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1130 break;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1131 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1132 if (is_accessobject(x)) {
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	1133 x = getaccessvalue(x, f->f_locals);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1134 if (x == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1135 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1136 }
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1137 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1138 INCREF(x);
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1139 PUSH(x);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1140 break;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1141
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1142 case STORE_FAST:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1143 v = POP();
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1144 w = GETLISTITEM(fastlocals, oparg);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1145 if (w != NULL && is_accessobject(w)) {
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	1146 err = setaccessvalue(w, f->f_locals, v);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1147 DECREF(v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1148 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1149 }
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1150 XDECREF(w);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1151 GETLISTITEM(fastlocals, oparg) = v;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1152 break;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1153
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1154 case DELETE_FAST:
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1155 x = GETLISTITEM(fastlocals, oparg);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1156 if (x == NULL) {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1157 err_setstr(NameError,
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1158 "undefined local variable");
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1159 break;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1160 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1161 if (w != NULL && is_accessobject(w)) {
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	1162 err = setaccessvalue(w, f->f_locals,
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	1163 (object *)NULL);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1164 break;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1165 }
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1166 DECREF(x);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1167 GETLISTITEM(fastlocals, oparg) = NULL;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1168 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1169
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1170 case BUILD_TUPLE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1171 x = newtupleobject(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1172 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1173 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1174 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1175 err = settupleitem(x, oparg, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1176 if (err != 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1177 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1178 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1179 PUSH(x);
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 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1182
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1183 case BUILD_LIST:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1184 x = newlistobject(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1185 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1186 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1187 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1188 err = setlistitem(x, oparg, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1189 if (err != 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1190 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1191 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1192 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1193 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1194 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1195
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1196 case BUILD_MAP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1197 x = newdictobject();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1198 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1199 break;
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 case LOAD_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1202 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1203 v = POP();
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1204 x = getattro(v, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1205 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1206 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1207 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1208
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1209 case COMPARE_OP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1210 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1211 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	1212 x = cmp_outcome(oparg, v, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1213 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1214 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1215 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1216 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1217
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1218 case IMPORT_NAME:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1219 name = GETNAME(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1220 x = import_module(name);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1221 XINCREF(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1222 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1223 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1224
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1225 case IMPORT_FROM:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1226 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1227 v = TOP();
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1228 err = import_from(f->f_locals, v, w);
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1229 locals_2_fast(f, 0);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1230 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1231
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1232 case ACCESS_MODE:
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1233 v = POP();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1234 w = GETNAMEV(oparg);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	1235 if (getstringvalue(w)[0] == '*')
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	1236 defmode = getintvalue(v);
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	1237 else
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	1238 err = access_statement(w, v, f);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1239 DECREF(v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1240 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1241
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1242 case JUMP_FORWARD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1243 JUMPBY(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1244 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1245
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1246 case JUMP_IF_FALSE:
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1247 err = testbool(TOP());
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1248 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1249 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1250 else if (err == 0)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1251 JUMPBY(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1252 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1253
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1254 case JUMP_IF_TRUE:
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1255 err = testbool(TOP());
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1256 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1257 err = 0;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1258 JUMPBY(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1259 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1260 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1261
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1262 case JUMP_ABSOLUTE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1263 JUMPTO(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1264 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1265
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1266 case FOR_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1267 /* for v in s: ...
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1268 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	1269 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	1270 but if loop exhausted:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1271 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	1272 w = POP(); /* Loop index */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1273 v = POP(); /* Sequence object */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1274 u = loop_subscript(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1275 if (u != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1276 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1277 x = newintobject(getintvalue(w)+1);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1278 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1279 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1280 PUSH(u);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1281 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1282 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1283 DECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1284 DECREF(w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1285 /* 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	1286 but also an error: */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1287 if (err_occurred())
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1288 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1289 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1290 JUMPBY(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1291 }
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 SETUP_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1295 case SETUP_EXCEPT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1296 case SETUP_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1297 setup_block(f, opcode, INSTR_OFFSET() + oparg,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1298 STACK_LEVEL());
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1299 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1300
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1301 case SET_LINENO:
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1302 #ifdef LLTRACE
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1303 if (lltrace)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1304 printf("--- Line %d ---\n", oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1305 #endif
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1306 f->f_lineno = oparg;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1307 if (trace != NULL) {
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1308 /* Trace each line of code reached */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1309 f->f_lasti = INSTR_OFFSET();
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1310 err = call_trace(&trace, &trace,
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1311 f, "line", None);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1312 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1313 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1314
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1315 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1316 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1317 "XXX lineno: %d, opcode: %d\n",
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1318 f->f_lineno, opcode);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1319 err_setstr(SystemError, "eval_code: unknown opcode");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1320 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1321 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1322
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1323 #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	1324 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1325 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1326
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1327 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1328
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1329 on_error:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1330
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1331 /* 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	1332
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1333 if (why == WHY_NOT) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1334 if (err == 0 && x != NULL)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1335 continue; /* Normal, fast path */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1336 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1337 x = None;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1338 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1339 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1340
814 f08d34499269 reverse sense of test for CHECKEXC Guido van Rossum <guido@python.org> parents: 802 diff changeset	1341 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1342 /* Double-check exception status */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1343
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1344 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1345 if (!err_occurred()) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1346 fprintf(stderr, "XXX ghost error\n");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1347 err_setstr(SystemError, "ghost error");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1348 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1349 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1350 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1351 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1352 if (err_occurred()) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1353 fprintf(stderr, "XXX undetected error\n");
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	1354 abort();
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	1355 /* NOTREACHED */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1356 why = WHY_EXCEPTION;
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 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1359 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1360
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1361 /* 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	1362
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1363 if (why == WHY_EXCEPTION) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1364 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	1365 if (HAS_ARG(opcode))
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1366 f->f_lasti -= 2;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1367 tb_here(f);
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1368
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1369 if (trace)
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1370 call_exc_trace(&trace, &trace, f);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1371 if (sys_profile)
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1372 call_exc_trace(&sys_profile, (object**)0, f);
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
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1375 /* 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	1376
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1377 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1378 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1379
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1380 /* 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	1381
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1382 while (why != WHY_NOT && f->f_iblock > 0) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1383 block *b = pop_block(f);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1384 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	1385 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1386 XDECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1387 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1388 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	1389 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1390 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1391 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1392 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1393 if (b->b_type == SETUP_FINALLY \|\|
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1394 b->b_type == SETUP_EXCEPT &&
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1395 why == WHY_EXCEPTION) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1396 if (why == WHY_EXCEPTION) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1397 object exc, val;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1398 err_get(&exc, &val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1399 if (val == NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1400 val = None;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1401 INCREF(val);
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 v = tb_fetch();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1404 /* Make the raw exception data
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1405 available to the handler,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1406 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	1407 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	1408 this for 'finally'. */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1409 if (b->b_type == SETUP_EXCEPT) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1410 sysset("exc_traceback", v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1411 sysset("exc_value", val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1412 sysset("exc_type", exc);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1413 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1414 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1415 PUSH(val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1416 PUSH(exc);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1417 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1418 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1419 if (why == WHY_RETURN)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1420 PUSH(retval);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1421 v = newintobject((long)why);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1422 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1423 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1424 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1425 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1426 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1427 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1428 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1429
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1430 /* 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	1431
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1432 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1433 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1434
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1435 } /* main loop */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1436
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1437 /* Pop remaining stack entries */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1438
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1439 while (!EMPTY()) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1440 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1441 XDECREF(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1442 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1443
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1444 if (why != WHY_RETURN)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1445 retval = NULL;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1446
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1447 if (trace) {
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1448 if (why == WHY_RETURN) {
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1449 if (call_trace(&trace, &trace, f, "return", retval)) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1450 XDECREF(retval);
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1451 retval = NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1452 why = WHY_EXCEPTION;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1453 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1454 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1455 XDECREF(trace);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1456 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1457
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1458 if (sys_profile && why == WHY_RETURN) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1459 if (call_trace(&sys_profile, (object**)0,
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1460 f, "return", retval)) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1461 XDECREF(retval);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1462 retval = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1463 why = WHY_EXCEPTION;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1464 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1465 }
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1466
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1467 if (fastlocals && (f->ob_refcnt > 1 \|\| f->f_locals->ob_refcnt > 2))
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1468 fast_2_locals(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1469
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1470 /* Restore previous frame and release the current one */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1471
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1472 current_frame = f->f_back;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1473 DECREF(f);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1474
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1475 if (needmerge)
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1476 locals_2_fast(current_frame, 1);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1477
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1478 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1479 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1480
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1481 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1482 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1483 prtrace(v, str)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1484 object *v;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1485 char *str;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1486 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1487 printf("%s ", str);
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 260 diff changeset	1488 if (printobject(v, stdout, 0) != 0)
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 260 diff changeset	1489 err_clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1490 printf("\n");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1491 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1492 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1493
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1494 static void
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1495 call_exc_trace(p_trace, p_newtrace, f)
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1496 object p_trace, p_newtrace;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1497 frameobject *f;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1498 {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1499 object type, value, traceback, arg;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1500 int err;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1501 err_get(&type, &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	1502 if (value == NULL) {
6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	1503 value = None;
6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	1504 INCREF(value);
6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	1505 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1506 traceback = tb_fetch();
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1507 arg = newtupleobject(3);
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	1508 if (arg == NULL)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1509 goto cleanup;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1510 settupleitem(arg, 0, type);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1511 settupleitem(arg, 1, value);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1512 settupleitem(arg, 2, traceback);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1513 err = call_trace(p_trace, p_newtrace, f, "exception", arg);
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	1514 if (!err) {
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1515 cleanup:
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1516 /* Restore original exception */
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1517 err_setval(type, value);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1518 tb_store(traceback);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1519 }
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	1520 XDECREF(arg);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1521 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1522
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1523 static int
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1524 call_trace(p_trace, p_newtrace, f, msg, arg)
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1525 object *p_trace; / in/out; may not be NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1526 may not point to NULL variable initially */
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1527 object *p_newtrace; / in/out; may be NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1528 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	1529 may be same variable as p_newtrace */
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1530 frameobject *f;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1531 char *msg;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1532 object *arg;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1533 {
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1534 object arglist, what;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1535 object *res = NULL;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1536 static int tracing = 0;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1537
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1538 if (tracing) {
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1539 /* 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	1540 if (p_newtrace) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1541 XDECREF(*p_newtrace);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1542 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1543 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1544 return 0;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1545 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1546
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1547 arglist = newtupleobject(3);
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1548 if (arglist == NULL)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1549 goto cleanup;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1550 what = newstringobject(msg);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1551 if (what == NULL)
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1552 goto cleanup;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1553 INCREF(f);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1554 settupleitem(arglist, 0, (object *)f);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1555 settupleitem(arglist, 1, what);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1556 if (arg == NULL)
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1557 arg = None;
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1558 INCREF(arg);
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1559 settupleitem(arglist, 2, arg);
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1560 tracing++;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1561 fast_2_locals(f);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1562 res = call_object(*p_trace, arglist);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1563 locals_2_fast(f, 1);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1564 tracing--;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1565 cleanup:
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1566 XDECREF(arglist);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1567 if (res == NULL) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1568 /* The trace proc raised an exception */
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1569 tb_here(f);
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	1570 DECREF(*p_trace);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1571 *p_trace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1572 if (p_newtrace) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1573 XDECREF(*p_newtrace);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1574 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1575 }
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	1576 return -1;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1577 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1578 else {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1579 if (p_newtrace) {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1580 XDECREF(*p_newtrace);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1581 if (res == None)
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1582 *p_newtrace = NULL;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1583 else {
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1584 INCREF(res);
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1585 *p_newtrace = res;
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1586 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1587 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1588 DECREF(res);
789 f565cf7f9aba (Hopefully) fix bug in reference count in call_exc_trace() Guido van Rossum <guido@python.org> parents: 746 diff changeset	1589 return 0;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	1590 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1591 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1592
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1593 static void
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1594 fast_2_locals(f)
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1595 frameobject *f;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1596 {
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1597 /* Merge f->f_fastlocals into f->f_locals */
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1598 object locals, fast, *map;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1599 object error_type, error_value;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1600 int pos;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1601 object key, value;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1602 if (f == NULL)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1603 return;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1604 locals = f->f_locals;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1605 fast = f->f_fastlocals;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1606 map = f->f_localmap;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1607 if (locals == NULL \|\| fast == NULL \|\| map == NULL)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1608 return;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1609 if (!is_dictobject(locals) \|\| !is_listobject(fast) \|\|
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1610 !is_dictobject(map))
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1611 return;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1612 err_get(&error_type, &error_value);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1613 pos = 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1614 while (mappinggetnext(map, &pos, &key, &value)) {
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1615 int j;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1616 if (!is_intobject(value))
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1617 continue;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1618 j = getintvalue(value);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1619 value = getlistitem(fast, j);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1620 if (value == NULL) {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1621 err_clear();
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1622 if (dict2remove(locals, key) != 0)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1623 err_clear();
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1624 }
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1625 else {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1626 if (dict2insert(locals, key, value) != 0)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1627 err_clear();
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1628 }
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1629 }
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1630 err_setval(error_type, error_value);
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1631 }
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1632
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1633 static void
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1634 locals_2_fast(f, clear)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1635 frameobject *f;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1636 int clear;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1637 {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1638 /* Merge f->f_locals into f->f_fastlocals */
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1639 object locals, fast, *map;
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	1640 object error_type, error_value;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1641 int pos;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1642 object key, value;
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1643 if (f == NULL)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1644 return;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1645 locals = f->f_locals;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1646 fast = f->f_fastlocals;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1647 map = f->f_localmap;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1648 if (locals == NULL \|\| fast == NULL \|\| map == NULL)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1649 return;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1650 if (!is_dictobject(locals) \|\| !is_listobject(fast) \|\|
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1651 !is_dictobject(map))
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1652 return;
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	1653 err_get(&error_type, &error_value);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1654 pos = 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1655 while (mappinggetnext(map, &pos, &key, &value)) {
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1656 int j;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1657 if (!is_intobject(value))
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1658 continue;
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1659 j = getintvalue(value);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1660 value = dict2lookup(locals, key);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1661 if (value == NULL)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1662 err_clear();
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1663 else
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1664 INCREF(value);
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1665 if (value != NULL \|\| clear)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1666 if (setlistitem(fast, j, value) != 0)
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1667 err_clear();
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1668 }
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	1669 err_setval(error_type, error_value);
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1670 }
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1671
1319 cd397266dc1c * Makefile: added all: and default: targets. Guido van Rossum <guido@python.org> parents: 1318 diff changeset	1672 static void
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1673 mergelocals()
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1674 {
f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1675 locals_2_fast(current_frame, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1676 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1677
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1678 object *
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1679 getlocals()
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1680 {
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1681 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	1682 return NULL;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1683 fast_2_locals(current_frame);
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1684 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	1685 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1686
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1687 object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1688 getglobals()
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1689 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1690 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1691 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1692 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1693 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1694 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1695
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1696 object *
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	1697 getowner()
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1698 {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1699 if (current_frame == NULL)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1700 return NULL;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1701 else
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	1702 return current_frame->f_owner;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1703 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1704
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1705 void
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	1706 printtraceback(f)
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	1707 object *f;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1708 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1709 object *v = tb_fetch();
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1710 if (v != NULL) {
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	1711 writestring("Stack backtrace (innermost last):\n", f);
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	1712 tb_print(v, f);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1713 DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1714 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1715 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1716
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1717
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1718 void
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1719 flushline()
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1720 {
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	1721 object *f = sysget("stdout");
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	1722 if (softspace(f, 0))
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	1723 writestring("\n", f);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1724 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1725
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1726
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1727 static object *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1728 or(v, w)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1729 object v, w;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1730 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1731 if (v->ob_type->tp_as_number != NULL) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1732 object *x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1733 object * (f) FPROTO((object , object *));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1734 if (coerce(&v, &w) != 0)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1735 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1736 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	1737 x = (*f)(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1738 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1739 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1740 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1741 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1742 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1743 err_setstr(TypeError, "bad operand type(s) for \|");
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1744 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1745 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1746
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1747 static object *
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1748 xor(v, w)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1749 object v, w;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1750 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1751 if (v->ob_type->tp_as_number != NULL) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1752 object *x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1753 object * (f) FPROTO((object , object *));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1754 if (coerce(&v, &w) != 0)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1755 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1756 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	1757 x = (*f)(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1758 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1759 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1760 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1761 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1762 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1763 err_setstr(TypeError, "bad operand type(s) for ^");
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1764 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1765 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1766
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1767 static object *
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1768 and(v, w)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1769 object v, w;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1770 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1771 if (v->ob_type->tp_as_number != NULL) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1772 object *x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1773 object * (f) FPROTO((object , object *));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1774 if (coerce(&v, &w) != 0)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1775 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1776 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	1777 x = (*f)(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1778 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1779 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1780 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1781 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1782 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1783 err_setstr(TypeError, "bad operand type(s) for &");
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1784 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1785 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1786
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1787 static object *
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1788 lshift(v, w)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1789 object v, w;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1790 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1791 if (v->ob_type->tp_as_number != NULL) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1792 object *x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1793 object * (f) FPROTO((object , object *));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1794 if (coerce(&v, &w) != 0)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1795 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1796 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	1797 x = (*f)(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1798 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1799 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1800 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1801 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1802 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1803 err_setstr(TypeError, "bad operand type(s) for <<");
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1804 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1805 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1806
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1807 static object *
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1808 rshift(v, w)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1809 object v, w;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1810 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1811 if (v->ob_type->tp_as_number != NULL) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1812 object *x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1813 object * (f) FPROTO((object , object *));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1814 if (coerce(&v, &w) != 0)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1815 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1816 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	1817 x = (*f)(v, w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1818 DECREF(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1819 DECREF(w);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1820 if (f != NULL)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1821 return x;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1822 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1823 err_setstr(TypeError, "bad operand type(s) for >>");
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1824 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1825 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1826
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1827 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1828 add(v, w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1829 object v, w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1830 {
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1831 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	1832 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	1833 else if (v->ob_type->tp_as_number != NULL) {
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1834 object *x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1835 if (coerce(&v, &w) != 0)
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1836 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1837 x = (*v->ob_type->tp_as_number->nb_add)(v, w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1838 DECREF(v);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1839 DECREF(w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1840 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1841 }
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1181 diff changeset	1842 err_setstr(TypeError, "bad operand type(s) for +");
2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1181 diff changeset	1843 return NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1844 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1845
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1846 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1847 sub(v, w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1848 object v, w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1849 {
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1850 if (v->ob_type->tp_as_number != NULL) {
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1851 object *x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1852 if (coerce(&v, &w) != 0)
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1853 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1854 x = (*v->ob_type->tp_as_number->nb_subtract)(v, w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1855 DECREF(v);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1856 DECREF(w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1857 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1858 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1859 err_setstr(TypeError, "bad operand type(s) for -");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1860 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1861 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1862
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1863 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1864 mul(v, w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1865 object v, w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1866 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1867 typeobject *tp;
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1868 tp = v->ob_type;
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1869 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	1870 w->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	1871 !is_instanceobject(v)) {
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1872 /* numbersequence -- swap v and w /
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1873 object *tmp = v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1874 v = w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1875 w = tmp;
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1876 tp = v->ob_type;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1877 }
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1878 if (tp->tp_as_number != NULL) {
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1879 object *x;
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1880 if (is_instanceobject(v)) {
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1881 /* 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	1882 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	1883 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	1884 numbernumber. /
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1885 INCREF(v);
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1886 INCREF(w);
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1887 }
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 944 diff changeset	1888 else if (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	1889 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1890 x = (*v->ob_type->tp_as_number->nb_multiply)(v, w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1891 DECREF(v);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1892 DECREF(w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1893 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1894 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1895 if (tp->tp_as_sequence != NULL) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1896 if (!is_intobject(w)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1897 err_setstr(TypeError,
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1898 "can't multiply sequence with non-int");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1899 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1900 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1901 return (*tp->tp_as_sequence->sq_repeat)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1902 (v, (int)getintvalue(w));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1903 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1904 err_setstr(TypeError, "bad operand type(s) for *");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1905 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1906 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1907
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1908 static object *
88 16e8c5d16493 Change div() into divide(); div() is a Standard C function. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1909 divide(v, w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1910 object v, w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1911 {
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1912 if (v->ob_type->tp_as_number != NULL) {
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1913 object *x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1914 if (coerce(&v, &w) != 0)
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1915 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1916 x = (*v->ob_type->tp_as_number->nb_divide)(v, w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1917 DECREF(v);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1918 DECREF(w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1919 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1920 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1921 err_setstr(TypeError, "bad operand type(s) for /");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1922 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1923 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1924
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1925 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1926 rem(v, w)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1927 object v, w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1928 {
302 d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1929 if (v->ob_type->tp_as_number != NULL) {
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1930 object *x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1931 if (coerce(&v, &w) != 0)
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1932 return NULL;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1933 x = (*v->ob_type->tp_as_number->nb_remainder)(v, w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1934 DECREF(v);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1935 DECREF(w);
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1936 return x;
d19a665904df Call coerce() in arithmetic operations, to support mixed mode arithmetic Guido van Rossum <guido@python.org> parents: 284 diff changeset	1937 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1207 diff changeset	1938 if (is_stringobject(v)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1207 diff changeset	1939 return formatstring(v, w);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1207 diff changeset	1940 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1941 err_setstr(TypeError, "bad operand type(s) for %");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1942 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1943 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1944
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1945 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1946 neg(v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1947 object *v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1948 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1949 if (v->ob_type->tp_as_number != NULL)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1950 return (*v->ob_type->tp_as_number->nb_negative)(v);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1951 err_setstr(TypeError, "bad operand type(s) for unary -");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1952 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1953 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1954
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1955 static object *
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1956 pos(v)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1957 object *v;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1958 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1959 if (v->ob_type->tp_as_number != NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1960 return (*v->ob_type->tp_as_number->nb_positive)(v);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1961 err_setstr(TypeError, "bad operand type(s) for unary +");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1962 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1963 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1964
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1965 static object *
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1966 invert(v)
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1967 object *v;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1968 {
671 10002e1bc526 Use correct prototype for invert(). Guido van Rossum <guido@python.org> parents: 661 diff changeset	1969 object * (f) FPROTO((object ));
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1970 if (v->ob_type->tp_as_number != NULL &&
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1971 (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	1972 return (*f)(v);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1973 err_setstr(TypeError, "bad operand type(s) for unary ~");
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1974 return NULL;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1975 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1976
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1977 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1978 not(v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1979 object *v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1980 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1981 int outcome = testbool(v);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1982 object *w;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1983 if (outcome < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1984 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1985 if (outcome == 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1986 w = True;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1987 else
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1988 w = False;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1989 INCREF(w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	1990 return w;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1991 }
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1293 diff changeset	1992
6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1293 diff changeset	1993
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	1994 /* External interface to call any callable object. The arg may be NULL. */
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	1995
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	1996 object *
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	1997 call_object(func, arg)
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	1998 object *func;
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	1999 object *arg;
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2000 {
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2001 if (is_instancemethodobject(func) \|\| is_funcobject(func))
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2002 return call_function(func, arg);
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2003 else
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2004 return call_builtin(func, arg);
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2005 }
e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	2006
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2007 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2008 call_builtin(func, arg)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2009 object *func;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2010 object *arg;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2011 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2012 if (is_methodobject(func)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2013 method meth = getmethod(func);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2014 object *self = getself(func);
481 dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2015 if (!getvarargs(func) && arg != NULL && is_tupleobject(arg)) {
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2016 int size = gettuplesize(arg);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2017 if (size == 1)
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2018 arg = gettupleitem(arg, 0);
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2019 else if (size == 0)
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2020 arg = NULL;
dc0463453a64 New argument passing mechanism. Guido van Rossum <guido@python.org> parents: 464 diff changeset	2021 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2022 return (*meth)(self, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2023 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2024 if (is_classobject(func)) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2025 return newinstanceobject(func, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2026 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2027 err_setstr(TypeError, "call of non-function");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2028 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2029 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2030
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2031 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2032 call_function(func, arg)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2033 object *func;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2034 object *arg;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2035 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2036 object *newarg = NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2037 object newlocals, newglobals;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2038 object *class = NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2039 object co, v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2040
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 173 diff changeset	2041 if (is_instancemethodobject(func)) {
e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 173 diff changeset	2042 object *self = instancemethodgetself(func);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2043 class = instancemethodgetclass(func);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 173 diff changeset	2044 func = instancemethodgetfunc(func);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2045 if (self == NULL) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2046 /* 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	2047 the class (or a derived class) as first argument */
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2048 if (arg != NULL && is_tupleobject(arg) &&
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2049 gettuplesize(arg) >= 1) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2050 self = gettupleitem(arg, 0);
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2051 if (self != NULL &&
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2052 is_instanceobject(self) &&
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2053 issubclass((object *)
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2054 (((instanceobject *)self)->in_class),
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2055 class))
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2056 /* self = self */ ;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2057 else
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2058 self = NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2059 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2060 if (self == NULL) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2061 err_setstr(TypeError,
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2062 "unbound method must be called with class instance argument");
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2063 return NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2064 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2065 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2066 else {
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2067 int argcount;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2068 if (arg == NULL)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2069 argcount = 0;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2070 else if (is_tupleobject(arg))
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2071 argcount = gettuplesize(arg);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2072 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2073 argcount = 1;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2074 newarg = newtupleobject(argcount + 1);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2075 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	2076 return NULL;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2077 INCREF(self);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2078 settupleitem(newarg, 0, self);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2079 if (arg != NULL && !is_tupleobject(arg)) {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2080 INCREF(arg);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2081 settupleitem(newarg, 1, arg);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2082 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2083 else {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2084 int i;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2085 object *v;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2086 for (i = 0; i < argcount; i++) {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2087 v = gettupleitem(arg, i);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2088 XINCREF(v);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2089 settupleitem(newarg, i+1, v);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2090 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2091 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2092 arg = newarg;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2093 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2094 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2095 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2096 if (!is_funcobject(func)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2097 err_setstr(TypeError, "call of non-function");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2098 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2099 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2100 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2101
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2102 co = getfunccode(func);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2103 if (co == NULL) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2104 XDECREF(newarg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2105 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2106 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2107 if (!is_codeobject(co)) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2108 fprintf(stderr, "XXX Bad code\n");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2109 abort();
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2110 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2111 newlocals = newdictobject();
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2112 if (newlocals == NULL) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2113 XDECREF(newarg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2114 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2115 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2116
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2117 newglobals = getfuncglobals(func);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2118 INCREF(newglobals);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2119
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2120 v = eval_code((codeobject *)co, newglobals, newlocals, class, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2121
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2122 DECREF(newlocals);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2123 DECREF(newglobals);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2124
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2125 XDECREF(newarg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2126
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2127 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2128 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2129
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2130 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2131 apply_subscript(v, w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2132 object v, w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2133 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2134 typeobject *tp = v->ob_type;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2135 if (tp->tp_as_sequence == NULL && tp->tp_as_mapping == NULL) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2136 err_setstr(TypeError, "unsubscriptable object");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2137 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2138 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2139 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	2140 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	2141 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2142 else {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2143 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2144 if (!is_intobject(w)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2145 err_setstr(TypeError, "sequence subscript not int");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2146 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2147 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2148 i = getintvalue(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2149 if (i < 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2150 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	2151 if (len < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2152 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2153 i += len;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2154 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2155 return (*tp->tp_as_sequence->sq_item)(v, i);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2156 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2157 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2158
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2159 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2160 loop_subscript(v, w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2161 object v, w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2162 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2163 sequence_methods *sq = v->ob_type->tp_as_sequence;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2164 int i, n;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2165 if (sq == NULL) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2166 err_setstr(TypeError, "loop over non-sequence");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2167 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2168 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2169 i = getintvalue(w);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2170 n = (*sq->sq_length)(v);
1096 ce718457b172 * classobject.c: in instance_lenth, test result of call_object Guido van Rossum <guido@python.org> parents: 1079 diff changeset	2171 if (n < 0)
ce718457b172 * classobject.c: in instance_lenth, test result of call_object Guido van Rossum <guido@python.org> parents: 1079 diff changeset	2172 return NULL; /* Exception */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2173 if (i >= n)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2174 return NULL; /* End of loop */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2175 return (*sq->sq_item)(v, i);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2176 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2177
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2178 static int
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2179 slice_index(v, isize, pi)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2180 object *v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2181 int isize;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2182 int *pi;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2183 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2184 if (v != NULL) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2185 if (!is_intobject(v)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2186 err_setstr(TypeError, "slice index must be int");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2187 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2188 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2189 *pi = getintvalue(v);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2190 if (*pi < 0)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2191 *pi += isize;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2192 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2193 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2194 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2195
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2196 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2197 apply_slice(u, v, w) /* return u[v:w] */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2198 object u, v, *w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2199 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2200 typeobject *tp = u->ob_type;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2201 int ilow, ihigh, isize;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2202 if (tp->tp_as_sequence == NULL) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2203 err_setstr(TypeError, "only sequences can be sliced");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2204 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2205 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2206 ilow = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2207 isize = ihigh = (*tp->tp_as_sequence->sq_length)(u);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2208 if (isize < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2209 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2210 if (slice_index(v, isize, &ilow) != 0)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2211 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2212 if (slice_index(w, isize, &ihigh) != 0)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2213 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2214 return (*tp->tp_as_sequence->sq_slice)(u, ilow, ihigh);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2215 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2216
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2217 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2218 assign_subscript(w, key, v) /* w[key] = v */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2219 object *w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2220 object *key;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2221 object *v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2222 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2223 typeobject *tp = w->ob_type;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2224 sequence_methods *sq;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2225 mapping_methods *mp;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2226 int (*func)();
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2227 if ((mp = 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	2228 (func = mp->mp_ass_subscript) != NULL) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2229 return (*func)(w, key, v);
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2230 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2231 else if ((sq = tp->tp_as_sequence) != NULL &&
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2232 (func = sq->sq_ass_item) != NULL) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2233 if (!is_intobject(key)) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2234 err_setstr(TypeError,
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2235 "sequence subscript must be integer (assign or del)");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2236 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2237 }
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2238 else {
9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2239 int i = getintvalue(key);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2240 if (i < 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2241 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	2242 if (len < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2243 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2244 i += len;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2245 }
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2246 return (*func)(w, i, v);
9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2247 }
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 else {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2250 err_setstr(TypeError,
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2251 "can't assign to this subscripted object");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2252 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2253 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2254 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2255
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2256 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2257 assign_slice(u, v, w, x) /* u[v:w] = x */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2258 object u, v, w, x;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2259 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2260 sequence_methods *sq = u->ob_type->tp_as_sequence;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2261 int ilow, ihigh, isize;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2262 if (sq == NULL) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2263 err_setstr(TypeError, "assign to slice of non-sequence");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2264 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2265 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2266 if (sq == NULL \|\| sq->sq_ass_slice == NULL) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2267 err_setstr(TypeError, "unassignable slice");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2268 return -1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2269 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2270 ilow = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2271 isize = ihigh = (*sq->sq_length)(u);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2272 if (isize < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2273 return -1;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2274 if (slice_index(v, isize, &ilow) != 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2275 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2276 if (slice_index(w, isize, &ihigh) != 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2277 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2278 return (*sq->sq_ass_slice)(u, ilow, ihigh, x);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2279 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2280
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2281 static int
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2282 cmp_exception(err, v)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2283 object err, v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2284 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2285 if (is_tupleobject(v)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2286 int i, n;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2287 n = gettuplesize(v);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2288 for (i = 0; i < n; i++) {
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	2289 /* Test recursively */
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	2290 if (cmp_exception(err, gettupleitem(v, i)))
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2291 return 1;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2292 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2293 return 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2294 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2295 return err == v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2296 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2297
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2298 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2299 cmp_member(v, w)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2300 object v, w;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2301 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2302 int i, n, cmp;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2303 object *x;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2304 sequence_methods *sq;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2305 /* Special case for char in string */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2306 if (is_stringobject(w)) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2307 register char s, end;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2308 register char c;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2309 if (!is_stringobject(v) \|\| getstringsize(v) != 1) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2310 err_setstr(TypeError,
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2311 "string member test needs char left operand");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2312 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2313 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2314 c = getstringvalue(v)[0];
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2315 s = getstringvalue(w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2316 end = s + getstringsize(w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2317 while (s < end) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2318 if (c == *s++)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2319 return 1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2320 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2321 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2322 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2323 sq = w->ob_type->tp_as_sequence;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2324 if (sq == NULL) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2325 err_setstr(TypeError,
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2326 "'in' or 'not in' needs sequence right argument");
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2327 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2328 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2329 n = (*sq->sq_length)(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2330 if (n < 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2331 return -1;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2332 for (i = 0; i < n; i++) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2333 x = (*sq->sq_item)(w, i);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2334 cmp = cmpobject(v, x);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2335 XDECREF(x);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2336 if (cmp == 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2337 return 1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2338 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2339 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2340 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2341
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2342 static object *
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2343 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	2344 int op;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2345 register object *v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2346 register object *w;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2347 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2348 register int cmp;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2349 register int res = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2350 switch (op) {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2351 case IS:
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2352 case IS_NOT:
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2353 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	2354 if (op == (int) IS_NOT)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2355 res = !res;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2356 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2357 case IN:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2358 case NOT_IN:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2359 res = cmp_member(v, w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2360 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2361 return NULL;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2362 if (op == (int) NOT_IN)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2363 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2364 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2365 case EXC_MATCH:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2366 res = cmp_exception(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2367 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2368 default:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2369 cmp = cmpobject(v, w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2370 switch (op) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2371 case LT: res = cmp < 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2372 case LE: res = cmp <= 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2373 case EQ: res = cmp == 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2374 case NE: res = cmp != 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2375 case GT: res = cmp > 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2376 case GE: res = cmp >= 0; break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2377 /* XXX no default? (res is initialized to 0 though) */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2378 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2379 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2380 v = res ? True : False;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2381 INCREF(v);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2382 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2383 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2384
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2385 static int
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2386 import_from(locals, v, name)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2387 object *locals;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2388 object *v;
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	2389 object *name;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2390 {
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2391 object w, x;
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2392 w = getmoduledict(v);
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	2393 if (getstringvalue(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	2394 int pos, err;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2395 object name, value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2396 pos = 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2397 while (mappinggetnext(w, &pos, &name, &value)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2398 if (!is_stringobject(name) \|\|
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2399 getstringvalue(name)[0] == '_')
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2400 continue;
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	2401 if (is_accessobject(value)) {
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2402 value = getaccessvalue(value, (object *)NULL);
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2403 if (value == NULL) {
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2404 err_clear();
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2405 continue;
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2406 }
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2407 }
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2408 else
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2409 INCREF(value);
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2410 err = dict2insert(locals, name, value);
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2411 DECREF(value);
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	2412 if (err != 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2413 return -1;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2414 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2415 return 0;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2416 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2417 else {
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	2418 x = dict2lookup(w, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2419 if (x == NULL) {
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2420 char buf[250];
661 7e5f4d9aee77 Limit length of name passed to sprintf. Guido van Rossum <guido@python.org> parents: 607 diff changeset	2421 sprintf(buf, "cannot import name %.230s",
506 9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2422 getstringvalue(name));
9f7161db5669 Negative subscript are now allowed as in slices. Guido van Rossum <guido@python.org> parents: 481 diff changeset	2423 err_setstr(ImportError, buf);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2424 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2425 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2426 else
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	2427 return dict2insert(locals, name, x);
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2428 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2429 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2430
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2431 static object *
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2432 build_class(methods, bases, name)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2433 object methods; / dictionary */
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2434 object bases; / tuple containing classes */
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2435 object name; / string */
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2436 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2437 int i;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2438 if (!is_tupleobject(bases)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2439 err_setstr(SystemError, "build_class with non-tuple bases");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2440 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2441 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2442 if (!is_dictobject(methods)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2443 err_setstr(SystemError, "build_class with non-dictionary");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2444 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2445 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2446 if (!is_stringobject(name)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2447 err_setstr(SystemError, "build_class witn non-string name");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2448 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2449 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2450 for (i = gettuplesize(bases); --i >= 0; ) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2451 object *base = gettupleitem(bases, i);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2452 if (!is_classobject(base)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2453 err_setstr(TypeError,
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2454 "base is not a class object");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2455 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2456 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2457 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2458 return newclassobject(bases, methods, name);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2459 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2460
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2461 static int
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2462 access_statement(name, vmode, f)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2463 object *name;
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2464 object *vmode;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2465 frameobject *f;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2466 {
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2467 int mode = getintvalue(vmode);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2468 object value, ac;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2469 typeobject *type;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2470 int fastind, ret;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2471 fastind = -1;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2472 if (f->f_localmap == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2473 value = dict2lookup(f->f_locals, name);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2474 else {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2475 value = dict2lookup(f->f_localmap, name);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2476 if (value == NULL \|\| !is_intobject(value))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2477 value = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2478 else {
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2479 fastind = getintvalue(value);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2480 if (0 <= fastind &&
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2481 fastind < getlistsize(f->f_fastlocals))
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2482 value = getlistitem(f->f_fastlocals, fastind);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2483 else {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2484 value = NULL;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2485 fastind = -1;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2486 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2487 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2488 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2489 if (value && is_accessobject(value)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2490 err_setstr(AccessError, "can't override access");
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2491 return -1;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2492 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2493 err_clear();
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2494 if (value != NULL && value != None)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2495 type = value->ob_type;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2496 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2497 type = NULL;
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	2498 ac = newaccessobject(value, f->f_locals, type, mode);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2499 if (ac == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2500 return -1;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2501 if (fastind >= 0)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2502 ret = setlistitem(f->f_fastlocals, fastind, ac);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2503 else {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2504 ret = dict2insert(f->f_locals, name, ac);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2505 DECREF(ac);
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2506 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2507 return ret;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2508 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2509
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2510 static int
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2511 exec_statement(prog, globals, locals)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2512 object *prog;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2513 object *globals;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2514 object *locals;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2515 {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2516 char *s;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2517 int n;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2518
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2519 if (is_tupleobject(prog) && globals == None && locals == None &&
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2520 ((n = gettuplesize(prog)) == 2 \|\| n == 3)) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2521 /* Backward compatibility hack */
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2522 globals = gettupleitem(prog, 1);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2523 if (n == 3)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2524 locals = gettupleitem(prog, 2);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2525 prog = gettupleitem(prog, 0);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2526 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2527 if (globals == None) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2528 globals = getglobals();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2529 if (locals == None)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2530 locals = getlocals();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2531 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2532 else if (locals == None)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2533 locals = globals;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2534 if (!is_stringobject(prog) &&
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2535 !is_codeobject(prog) &&
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2536 !is_fileobject(prog)) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2537 err_setstr(TypeError,
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2538 "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	2539 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2540 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2541 if (!is_dictobject(globals) \|\| !is_dictobject(locals)) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2542 err_setstr(TypeError,
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2543 "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	2544 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2545 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2546 if (is_codeobject(prog)) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2547 if (eval_code((codeobject *) prog, globals, locals,
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2548 (object )NULL, (object )NULL) == NULL)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2549 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2550 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2551 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2552 if (is_fileobject(prog)) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2553 FILE *fp = getfilefile(prog);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2554 char *name = getstringvalue(getfilename(prog));
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2555 if (run_file(fp, name, file_input, globals, locals) == NULL)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2556 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2557 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2558 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2559 s = getstringvalue(prog);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2560 if (strlen(s) != getstringsize(prog)) {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2561 err_setstr(ValueError, "embedded '\\0' in exec string");
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2562 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2563 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2564 if (run_string(s, file_input, globals, locals) == NULL)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2565 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2566 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	2567 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 1356:043da19302ef legacy-trunk