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

annotate Python/ceval.c @ 22621:830c829a7eb2 legacy-trunk

Fix an issue that was reported in but unrelated to the main problem of SF bug 535905 (Evil Trashcan and GC interaction). The SETLOCAL() macro should not DECREF the local variable in-place and then store the new value; it should copy the old value to a temporary value, then store the new value, and then DECREF the temporary value. This is because it is possible that during the DECREF the frame is accessed by other code (e.g. a __del__ method or gc.collect()) and the variable would be pointing to already-freed memory. BUGFIX CANDIDATE!

author	Guido van Rossum <guido@python.org>
date	Thu, 28 Mar 2002 20:17:52 +0000
parents	3a3de6567f1a
children	aae814f94bad

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2 /* Execute compiled code */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4 /* XXX TO DO:
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	5 XXX speed up searching for keywords by using a dictionary
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	6 XXX document it!
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	7 */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	8
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	9 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	10
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	11 #include "compile.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	12 #include "frameobject.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	13 #include "eval.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	14 #include "opcode.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	15 #include "structmember.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	16
13552 dd2b5218e069 Include macglue.h for some function prototypes, and renamed a few Jack Jansen <jack.jansen@cwi.nl> parents: 13447 diff changeset	17 #ifdef macintosh
dd2b5218e069 Include macglue.h for some function prototypes, and renamed a few Jack Jansen <jack.jansen@cwi.nl> parents: 13447 diff changeset	18 #include "macglue.h"
dd2b5218e069 Include macglue.h for some function prototypes, and renamed a few Jack Jansen <jack.jansen@cwi.nl> parents: 13447 diff changeset	19 #endif
dd2b5218e069 Include macglue.h for some function prototypes, and renamed a few Jack Jansen <jack.jansen@cwi.nl> parents: 13447 diff changeset	20
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	21 #include <ctype.h>
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	22
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	23 /* Turn this on if your compiler chokes on the big switch: */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	24 /* #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	25
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	26 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	27 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	28 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	29 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	30 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	32 typedef PyObject (callproc)(PyObject , PyObject , PyObject *);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	33
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	34 /* Forward declarations */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	35 static PyObject eval_frame(PyFrameObject );
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	36 static PyObject fast_function(PyObject , PyObject ***, int, int, int);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	37 static PyObject fast_cfunction(PyObject , PyObject ***, int);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	38 static PyObject do_call(PyObject , PyObject ***, int, int);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	39 static PyObject ext_do_call(PyObject , PyObject ***, int, int, int);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	40 static PyObject update_keyword_args(PyObject , int, PyObject **,PyObject );
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	41 static PyObject update_star_args(int, int, PyObject , PyObject ***);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	42 static PyObject load_args(PyObject **, int);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	43 #define CALL_FLAG_VAR 1
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	44 #define CALL_FLAG_KW 2
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	45
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	46 #ifdef LLTRACE
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	47 static int prtrace(PyObject , char );
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	48 #endif
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	49 static int call_trace(Py_tracefunc, PyObject , PyFrameObject ,
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	50 int, PyObject *);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	51 static void call_trace_protected(Py_tracefunc, PyObject *,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	52 PyFrameObject *, int);
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	53 static void call_exc_trace(Py_tracefunc, PyObject , PyFrameObject );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	54 static PyObject loop_subscript(PyObject , PyObject *);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	55 static PyObject apply_slice(PyObject , PyObject , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	56 static int assign_slice(PyObject , PyObject ,
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	57 PyObject , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	58 static PyObject cmp_outcome(int, PyObject , PyObject *);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	59 static PyObject import_from(PyObject , PyObject *);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	60 static int import_all_from(PyObject , PyObject );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	61 static PyObject build_class(PyObject , PyObject , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	62 static int exec_statement(PyFrameObject *,
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	63 PyObject , PyObject , PyObject *);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	64 static void set_exc_info(PyThreadState , PyObject , PyObject , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	65 static void reset_exc_info(PyThreadState *);
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	66 static void format_exc_check_arg(PyObject , char , PyObject *);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	67
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	68 #define NAME_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	69 "name '%.200s' is not defined"
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	70 #define GLOBAL_NAME_ERROR_MSG \
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	71 "global name '%.200s' is not defined"
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	72 #define UNBOUNDLOCAL_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	73 "local variable '%.200s' referenced before assignment"
17494 a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	74 #define UNBOUNDFREE_ERROR_MSG \
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	75 "free variable '%.200s' referenced before assignment" \
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	76 " in enclosing scope"
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	77
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	78 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	79 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	80 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	81 static long dxpairs[257][256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	82 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	83 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	84 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	85 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	86 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	87
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	88 staticforward PyTypeObject gentype;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	89
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	90 typedef struct {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	91 PyObject_HEAD
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	92 /* The gi_ prefix is intended to remind of generator-iterator. */
6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	93
6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	94 PyFrameObject *gi_frame;
6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	95
18293 0344e4ac70b0 gen_getattr: make the gi_running and gi_frame members discoverable (but Tim Peters <tim.peters@gmail.com> parents: 18288 diff changeset	96 /* True if generator is being executed. */
0344e4ac70b0 gen_getattr: make the gi_running and gi_frame members discoverable (but Tim Peters <tim.peters@gmail.com> parents: 18288 diff changeset	97 int gi_running;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	98 } genobject;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	99
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	100 static PyObject *
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	101 gen_new(PyFrameObject *f)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	102 {
22398 963e814e69cc Re-enable GC of generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21974 diff changeset	103 genobject *gen = PyObject_GC_New(genobject, &gentype);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	104 if (gen == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	105 Py_DECREF(f);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	106 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	107 }
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	108 gen->gi_frame = f;
6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	109 gen->gi_running = 0;
22398 963e814e69cc Re-enable GC of generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21974 diff changeset	110 _PyObject_GC_TRACK(gen);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	111 return (PyObject *)gen;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	112 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	113
18513 65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	114 static int
65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	115 gen_traverse(genobject gen, visitproc visit, void arg)
65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	116 {
65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	117 return visit((PyObject *)gen->gi_frame, arg);
65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	118 }
65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	119
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	120 static void
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	121 gen_dealloc(genobject *gen)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	122 {
22398 963e814e69cc Re-enable GC of generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21974 diff changeset	123 _PyObject_GC_UNTRACK(gen);
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	124 Py_DECREF(gen->gi_frame);
22398 963e814e69cc Re-enable GC of generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21974 diff changeset	125 PyObject_GC_Del(gen);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	126 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	127
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	128 static PyObject *
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	129 gen_iternext(genobject *gen)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	130 {
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	131 PyThreadState *tstate = PyThreadState_GET();
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	132 PyFrameObject *f = gen->gi_frame;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	133 PyObject *result;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	134
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	135 if (gen->gi_running) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	136 PyErr_SetString(PyExc_ValueError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	137 "generator already executing");
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	138 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	139 }
18237 f02605b8fdc1 PyFrameObject: rename f_stackbottom to f_stacktop, since it points to Tim Peters <tim.peters@gmail.com> parents: 18195 diff changeset	140 if (f->f_stacktop == NULL)
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	141 return NULL;
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	142
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	143 /* Generators always return to their most recent caller, not
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	144 * necessarily their creator. */
18239 a1ef43a6d6e1 gen_iternext(): Don't assume that the current thread state's frame is Tim Peters <tim.peters@gmail.com> parents: 18237 diff changeset	145 Py_XINCREF(tstate->frame);
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	146 assert(f->f_back == NULL);
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	147 f->f_back = tstate->frame;
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	148
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	149 gen->gi_running = 1;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	150 result = eval_frame(f);
18288 6800bcce0455 Add "gi_" (generator-iterator) prefix to names of genobject members. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	151 gen->gi_running = 0;
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	152
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	153 /* Don't keep the reference to f_back any longer than necessary. It
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	154 * may keep a chain of frames alive or it could create a reference
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	155 * cycle. */
18239 a1ef43a6d6e1 gen_iternext(): Don't assume that the current thread state's frame is Tim Peters <tim.peters@gmail.com> parents: 18237 diff changeset	156 Py_XDECREF(f->f_back);
18172 12d7d4db69f2 gen_iternext(): repair subtle refcount problem. Tim Peters <tim.peters@gmail.com> parents: 18171 diff changeset	157 f->f_back = NULL;
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	158
18243 47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	159 /* If the generator just returned (as opposed to yielding), signal
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	160 * that the generator is exhausted. */
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	161 if (result == Py_None && f->f_stacktop == NULL) {
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	162 Py_DECREF(result);
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	163 result = NULL;
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	164 }
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18239 diff changeset	165
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	166 return result;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	167 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	168
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	169 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	170 gen_next(genobject *gen)
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	171 {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	172 PyObject *result;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	173
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	174 result = gen_iternext(gen);
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	175
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	176 if (result == NULL && !PyErr_Occurred()) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	177 PyErr_SetObject(PyExc_StopIteration, Py_None);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	178 return NULL;
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	179 }
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	180
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	181 return result;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	182 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	183
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	184 static PyObject *
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	185 gen_getiter(PyObject *gen)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	186 {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	187 Py_INCREF(gen);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	188 return gen;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	189 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	190
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	191 static struct PyMethodDef gen_methods[] = {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	192 {"next", (PyCFunction)gen_next, METH_NOARGS,
18293 0344e4ac70b0 gen_getattr: make the gi_running and gi_frame members discoverable (but Tim Peters <tim.peters@gmail.com> parents: 18288 diff changeset	193 "next() -- get the next value, or raise StopIteration"},
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	194 {NULL, NULL} /* Sentinel */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	195 };
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	196
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19896 diff changeset	197 static PyMemberDef gen_memberlist[] = {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	198 {"gi_frame", T_OBJECT, offsetof(genobject, gi_frame), RO},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	199 {"gi_running", T_INT, offsetof(genobject, gi_running), RO},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	200 {NULL} /* Sentinel */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	201 };
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	202
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	203 statichere PyTypeObject gentype = {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	204 PyObject_HEAD_INIT(&PyType_Type)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	205 0, /* ob_size */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	206 "generator", /* tp_name */
22398 963e814e69cc Re-enable GC of generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21974 diff changeset	207 sizeof(genobject), /* tp_basicsize */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	208 0, /* tp_itemsize */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	209 /* methods */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	210 (destructor)gen_dealloc, /* tp_dealloc */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	211 0, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	212 0, /* tp_getattr */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	213 0, /* tp_setattr */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	214 0, /* tp_compare */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	215 0, /* tp_repr */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	216 0, /* tp_as_number */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	217 0, /* tp_as_sequence */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	218 0, /* tp_as_mapping */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	219 0, /* tp_hash */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	220 0, /* tp_call */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	221 0, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	222 PyObject_GenericGetAttr, /* tp_getattro */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	223 0, /* tp_setattro */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	224 0, /* tp_as_buffer */
22398 963e814e69cc Re-enable GC of generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21974 diff changeset	225 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	226 0, /* tp_doc */
18513 65afac84d4f7 GC for generator objects. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18374 diff changeset	227 (traverseproc)gen_traverse, /* tp_traverse */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	228 0, /* tp_clear */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	229 0, /* tp_richcompare */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	230 0, /* tp_weaklistoffset */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	231 (getiterfunc)gen_getiter, /* tp_iter */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	232 (iternextfunc)gen_iternext, /* tp_iternext */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	233 gen_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	234 gen_memberlist, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	235 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	236 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	237 0, /* tp_dict */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	238 };
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	239
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	240
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	241 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	242
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 10363 diff changeset	243 #ifndef DONT_HAVE_ERRNO_H
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	244 #include <errno.h>
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 10363 diff changeset	245 #endif
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9048 diff changeset	246 #include "pythread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	247
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	248 extern int _PyThread_Started; /* Flag for Py_Exit */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	249
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	250 static PyThread_type_lock interpreter_lock = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	251 static long main_thread = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	252
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	253 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	254 PyEval_InitThreads(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	255 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	256 if (interpreter_lock)
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	257 return;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	258 _PyThread_Started = 1;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	259 interpreter_lock = PyThread_allocate_lock();
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	260 PyThread_acquire_lock(interpreter_lock, 1);
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	261 main_thread = PyThread_get_thread_ident();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	262 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	263
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	264 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	265 PyEval_AcquireLock(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	266 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	267 PyThread_acquire_lock(interpreter_lock, 1);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	268 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	269
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	270 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	271 PyEval_ReleaseLock(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	272 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	273 PyThread_release_lock(interpreter_lock);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	274 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	275
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	276 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	277 PyEval_AcquireThread(PyThreadState *tstate)
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	278 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	279 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	280 Py_FatalError("PyEval_AcquireThread: NULL new thread state");
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	281 PyThread_acquire_lock(interpreter_lock, 1);
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	282 if (PyThreadState_Swap(tstate) != NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	283 Py_FatalError(
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	284 "PyEval_AcquireThread: non-NULL old thread state");
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	285 }
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	286
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	287 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	288 PyEval_ReleaseThread(PyThreadState *tstate)
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	289 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	290 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	291 Py_FatalError("PyEval_ReleaseThread: NULL thread state");
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	292 if (PyThreadState_Swap(NULL) != tstate)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	293 Py_FatalError("PyEval_ReleaseThread: wrong thread state");
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	294 PyThread_release_lock(interpreter_lock);
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	295 }
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	296
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	297 /* This function is called from PyOS_AfterFork to ensure that newly
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	298 created child processes don't hold locks referring to threads which
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	299 are not running in the child process. (This could also be done using
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	300 pthread_atfork mechanism, at least for the pthreads implementation.) */
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	301
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	302 void
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	303 PyEval_ReInitThreads(void)
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	304 {
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	305 if (!interpreter_lock)
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	306 return;
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	307 /*XXX Can't use PyThread_free_lock here because it does too
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	308 much error-checking. Doing this cleanly would require
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	309 adding a new function to each thread_*.h. Instead, just
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	310 create a new lock and waste a little bit of memory */
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	311 interpreter_lock = PyThread_allocate_lock();
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	312 PyThread_acquire_lock(interpreter_lock, 1);
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	313 main_thread = PyThread_get_thread_ident();
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	314 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	315 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	316
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	317 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	318 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	319 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	320
5846 852a1fa62a7c PyEval_SaveThread() and PyEval_RestoreThread() now return/take a Guido van Rossum <guido@python.org> parents: 5829 diff changeset	321 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	322 PyEval_SaveThread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	323 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	324 PyThreadState *tstate = PyThreadState_Swap(NULL);
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	325 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	326 Py_FatalError("PyEval_SaveThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	327 #ifdef WITH_THREAD
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	328 if (interpreter_lock)
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	329 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	330 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	331 return tstate;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	332 }
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 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	335 PyEval_RestoreThread(PyThreadState *tstate)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	336 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	337 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	338 Py_FatalError("PyEval_RestoreThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	339 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	340 if (interpreter_lock) {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	341 int err = errno;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	342 PyThread_acquire_lock(interpreter_lock, 1);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	343 errno = err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	344 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	345 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	346 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	347 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	348
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	349
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	350 /* Mechanism whereby asynchronously executing callbacks (e.g. UNIX
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	351 signal handlers or Mac I/O completion routines) can schedule calls
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	352 to a function to be called synchronously.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	353 The synchronous function is called with one void* argument.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	354 It should return 0 for success or -1 for failure -- failure should
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	355 be accompanied by an exception.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	356
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	357 If registry succeeds, the registry function returns 0; if it fails
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	358 (e.g. due to too many pending calls) it returns -1 (without setting
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	359 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	360
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	361 Note that because registry may occur from within signal handlers,
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	362 or other asynchronous events, calling malloc() is unsafe!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	363
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	364 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	365 Any thread can schedule pending calls, but only the main thread
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	366 will execute them.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	367 #endif
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	368
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	369 XXX WARNING! ASYNCHRONOUSLY EXECUTING CODE!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	370 There are two possible race conditions:
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	371 (1) nested asynchronous registry calls;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	372 (2) registry calls made while pending calls are being processed.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	373 While (1) is very unlikely, (2) is a real possibility.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	374 The current code is safe against (2), but not against (1).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	375 The safety against (2) is derived from the fact that only one
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	376 thread (the main thread) ever takes things out of the queue.
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	377
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	378 XXX Darn! With the advent of thread state, we should have an array
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	379 of pending calls per thread in the thread state! Later...
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	380 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	381
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	382 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	383 static struct {
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	384 int (func)(void );
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	385 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	386 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	387 static volatile int pendingfirst = 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	388 static volatile int pendinglast = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	389 static volatile int things_to_do = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	390
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	391 int
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	392 Py_AddPendingCall(int (func)(void ), void *arg)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	393 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	394 static int busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	395 int i, j;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	396 /* XXX Begin critical section */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	397 /* XXX If you want this to be safe against nested
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	398 XXX asynchronous calls, you'll have to work harder! */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	399 if (busy)
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	400 return -1;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	401 busy = 1;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	402 i = pendinglast;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	403 j = (i + 1) % NPENDINGCALLS;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	404 if (j == pendingfirst)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	405 return -1; /* Queue full */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	406 pendingcalls[i].func = func;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	407 pendingcalls[i].arg = arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	408 pendinglast = j;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	409 things_to_do = 1; /* Signal main loop */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	410 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	411 /* XXX End critical section */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	412 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	413 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	414
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	415 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	416 Py_MakePendingCalls(void)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	417 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	418 static int busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	419 #ifdef WITH_THREAD
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	420 if (main_thread && PyThread_get_thread_ident() != main_thread)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	421 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	422 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	423 if (busy)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	424 return 0;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	425 busy = 1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	426 things_to_do = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	427 for (;;) {
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	428 int i;
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	429 int (func)(void );
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	430 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	431 i = pendingfirst;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	432 if (i == pendinglast)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	433 break; /* Queue empty */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	434 func = pendingcalls[i].func;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	435 arg = pendingcalls[i].arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	436 pendingfirst = (i + 1) % NPENDINGCALLS;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	437 if (func(arg) < 0) {
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	438 busy = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	439 things_to_do = 1; /* We're not done yet */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	440 return -1;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	441 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	442 }
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	443 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	444 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	445 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	446
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	447
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	448 /* The interpreter's recursion limit */
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	449
14325 22b2ebd78372 Set the recursion limit to 1000 -- 2500 was not enough, let's be Guido van Rossum <guido@python.org> parents: 14318 diff changeset	450 static int recursion_limit = 1000;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	451
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	452 int
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	453 Py_GetRecursionLimit(void)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	454 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	455 return recursion_limit;
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	456 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	457
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	458 void
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	459 Py_SetRecursionLimit(int new_limit)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	460 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	461 recursion_limit = new_limit;
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	462 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	463
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	464 /* 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	465
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	466 enum why_code {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	467 WHY_NOT, /* No error */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	468 WHY_EXCEPTION, /* Exception occurred */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	469 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	470 WHY_RETURN, /* 'return' statement */
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	471 WHY_BREAK, /* 'break' statement */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	472 WHY_CONTINUE, /* 'continue' statement */
20541 f567b45737c0 SF Patch (but with no patch) 472555 Remove trailing common in enumeration. Tim Peters <tim.peters@gmail.com> parents: 20492 diff changeset	473 WHY_YIELD /* 'yield' operator */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	474 };
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	475
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	476 static enum why_code do_raise(PyObject , PyObject , PyObject *);
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	477 static int unpack_iterable(PyObject , int, PyObject *);
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	478
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	479
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	480 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	481 PyEval_EvalCode(PyCodeObject co, PyObject globals, PyObject *locals)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	482 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	483 return PyEval_EvalCodeEx(co,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	484 globals, locals,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	485 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	486 (PyObject **)NULL, 0,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	487 (PyObject **)NULL, 0,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	488 NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	489 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	490
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	491
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	492 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	493
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	494 static PyObject *
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	495 eval_frame(PyFrameObject *f)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	496 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	497 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	498 int lastopcode = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	499 #endif
21477 ccb26a118867 SF bug #494668: PUSH() should assert-fail on overflow. Tim Peters <tim.peters@gmail.com> parents: 21475 diff changeset	500 PyObject *stack_pointer; / Next free slot in value stack */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	501 register unsigned char *next_instr;
13881 c4e321834250 Initialized opcode and oparg to silence a gcc -Wall warning. Moshe Zadka <moshez@math.huji.ac.il> parents: 13709 diff changeset	502 register int opcode=0; /* Current opcode */
c4e321834250 Initialized opcode and oparg to silence a gcc -Wall warning. Moshe Zadka <moshez@math.huji.ac.il> parents: 13709 diff changeset	503 register int oparg=0; /* Current opcode argument, if any */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	504 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	505 register int err; /* Error status -- nonzero if error */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	506 register PyObject x; / Result object -- NULL if error */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	507 register PyObject v; / Temporary objects popped off stack */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	508 register PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	509 register PyObject *u;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	510 register PyObject *t;
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	511 register PyObject stream = NULL; / for PRINT opcodes */
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	512 register PyObject fastlocals, freevars;
9513 350f24180dcb Whoops! One the "redundant" initializations removed by Vladimir in Guido van Rossum <guido@python.org> parents: 9490 diff changeset	513 PyObject retval = NULL; / Return value */
9671 1d40bc25703a Use PyThreadState_GET() macro. Guido van Rossum <guido@python.org> parents: 9591 diff changeset	514 PyThreadState *tstate = PyThreadState_GET();
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	515 PyCodeObject *co;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	516 unsigned char *first_instr;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	517 #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	518 int lltrace;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	519 #endif
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	520 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	521 /* Make it easier to find out where we are with a debugger */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	522 char *filename;
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	523 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	524
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	525 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	526
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	527 #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	528 #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	529 #define GETNAMEV(i) Getnamev(f, i)
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	530 #define INSTR_OFFSET() (next_instr - first_instr)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	531 #define NEXTOP() (*next_instr++)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	532 #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	533 #define JUMPTO(x) (next_instr = first_instr + (x))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	534 #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	535
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	536 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	537
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	538 #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	539 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	540 #define TOP() (stack_pointer[-1])
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	541 #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	542 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	543
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	544 #ifdef LLTRACE
20492 bf4ff05eab52 For debug build, check that the stack pointer never exceeds the stack size. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20438 diff changeset	545 #define PUSH(v) { (void)(BASIC_PUSH(v), \
bf4ff05eab52 For debug build, check that the stack pointer never exceeds the stack size. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20438 diff changeset	546 lltrace && prtrace(TOP(), "push")); \
bf4ff05eab52 For debug build, check that the stack pointer never exceeds the stack size. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20438 diff changeset	547 assert(STACK_LEVEL() <= f->f_stacksize); }
20409 b98185c882e4 Suppress a bunch of "value computed is not used" warnings when building in Fred Drake <fdrake@acm.org> parents: 20275 diff changeset	548 #define POP() ((void)(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	549 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	550 #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	551 #define POP() BASIC_POP()
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	552 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	553
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	554 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	555
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	556 #define GETLOCAL(i) (fastlocals[i])
22621 830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	557
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	558 /* The SETLOCAL() macro must not DECREF the local variable in-place and
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	559 then store the new value; it must copy the old value to a temporary
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	560 value, then store the new value, and then DECREF the temporary value.
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	561 This is because it is possible that during the DECREF the frame is
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	562 accessed by other code (e.g. a __del__ method or gc.collect()) and the
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	563 variable would be pointing to already-freed memory. */
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	564 #define SETLOCAL(i, value) do { PyObject *tmp = GETLOCAL(i); \
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	565 GETLOCAL(i) = value; \
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	566 Py_XDECREF(tmp); } while (0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	567
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	568 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	569
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	570 if (f == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	571 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	572
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	573 #ifdef USE_STACKCHECK
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	574 if (tstate->recursion_depth%10 == 0 && PyOS_CheckStack()) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	575 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	576 return NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	577 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	578 #endif
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	579
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	580 /* push frame */
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	581 if (++tstate->recursion_depth > recursion_limit) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	582 --tstate->recursion_depth;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	583 PyErr_SetString(PyExc_RuntimeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	584 "maximum recursion depth exceeded");
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	585 tstate->frame = f->f_back;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	586 return NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	587 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	588
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	589 tstate->frame = f;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	590 co = f->f_code;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	591 fastlocals = f->f_localsplus;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	592 freevars = f->f_localsplus + f->f_nlocals;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	593 _PyCode_GETCODEPTR(co, &first_instr);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	594 next_instr = first_instr + f->f_lasti;
18237 f02605b8fdc1 PyFrameObject: rename f_stackbottom to f_stacktop, since it points to Tim Peters <tim.peters@gmail.com> parents: 18195 diff changeset	595 stack_pointer = f->f_stacktop;
f02605b8fdc1 PyFrameObject: rename f_stackbottom to f_stacktop, since it points to Tim Peters <tim.peters@gmail.com> parents: 18195 diff changeset	596 assert(stack_pointer != NULL);
21477 ccb26a118867 SF bug #494668: PUSH() should assert-fail on overflow. Tim Peters <tim.peters@gmail.com> parents: 21475 diff changeset	597 f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	598
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	599 if (tstate->use_tracing) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	600 if (tstate->c_tracefunc != NULL) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	601 /* tstate->c_tracefunc, if defined, is a
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	602 function that will be called on every entry
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	603 to a code block. Its return value, if not
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	604 None, is a function that will be called at
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	605 the start of each executed line of code.
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	606 (Actually, the function must return itself
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	607 in order to continue tracing.) The trace
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	608 functions are called with three arguments:
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	609 a pointer to the current frame, a string
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	610 indicating why the function is called, and
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	611 an argument which depends on the situation.
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	612 The global trace function is also called
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	613 whenever an exception is detected. */
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	614 if (call_trace(tstate->c_tracefunc, tstate->c_traceobj,
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	615 f, PyTrace_CALL, Py_None)) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	616 /* Trace function raised an error */
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	617 return NULL;
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	618 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	619 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	620 if (tstate->c_profilefunc != NULL) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	621 /* Similar for c_profilefunc, except it needn't
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	622 return itself and isn't called for "line" events */
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	623 if (call_trace(tstate->c_profilefunc,
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	624 tstate->c_profileobj,
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	625 f, PyTrace_CALL, Py_None)) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	626 /* Profile function raised an error */
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	627 return NULL;
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	628 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	629 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	630 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	631
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	632 #ifdef LLTRACE
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	633 lltrace = PyDict_GetItemString(f->f_globals,"__lltrace__") != NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	634 #endif
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	635 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	636 filename = PyString_AsString(co->co_filename);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	637 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	638
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	639 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	640 err = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	641 x = Py_None; /* Not a reference, just anything non-NULL */
15152 ed49a67869e9 Remove the last gcc -Wall warning about possible use of an uninitialized Fred Drake <fdrake@acm.org> parents: 15151 diff changeset	642 w = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	643
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	644 for (;;) {
21477 ccb26a118867 SF bug #494668: PUSH() should assert-fail on overflow. Tim Peters <tim.peters@gmail.com> parents: 21475 diff changeset	645 assert(stack_pointer >= f->f_valuestack); /* else underflow */
ccb26a118867 SF bug #494668: PUSH() should assert-fail on overflow. Tim Peters <tim.peters@gmail.com> parents: 21475 diff changeset	646 assert(STACK_LEVEL() <= f->f_stacksize); /* else overflow */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	647 /* Do periodic things. Doing this every time through
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	648 the loop would add too much overhead, so we do it
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	649 only every Nth instruction. We also do it if
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	650 ``things_to_do'' is set, i.e. when an asynchronous
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	651 event needs attention (e.g. a signal handler or
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	652 async I/O handler); see Py_AddPendingCall() and
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	653 Py_MakePendingCalls() above. */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	654
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	655 if (things_to_do \|\| --tstate->ticker < 0) {
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	656 tstate->ticker = tstate->interp->checkinterval;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	657 if (things_to_do) {
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	658 if (Py_MakePendingCalls() < 0) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	659 why = WHY_EXCEPTION;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	660 goto on_error;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	661 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	662 }
5551 34509c05266f Logic for enabling mac-specific signal handling fixed (Jack) Guido van Rossum <guido@python.org> parents: 5492 diff changeset	663 #if !defined(HAVE_SIGNAL_H) \|\| defined(macintosh)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	664 /* If we have true signals, the signal handler
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	665 will call Py_AddPendingCall() so we don't
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	666 have to call sigcheck(). On the Mac and
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	667 DOS, alas, we have to call it. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	668 if (PyErr_CheckSignals()) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	669 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	670 goto on_error;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	671 }
5021 c22add364351 Only call sigcheck() at the ticker code if we don't have true signals. Guido van Rossum <guido@python.org> parents: 5018 diff changeset	672 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	673
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	674 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	675 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	676 /* Give another thread a chance */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	677
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	678 if (PyThreadState_Swap(NULL) != tstate)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	679 Py_FatalError("ceval: tstate mix-up");
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	680 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	681
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	682 /* Other threads may run now */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	683
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	684 PyThread_acquire_lock(interpreter_lock, 1);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	685 if (PyThreadState_Swap(tstate) != NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	686 Py_FatalError("ceval: orphan tstate");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	687 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	688 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	689 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	690
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	691 fast_next_opcode:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	692 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	693
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	694 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	695 f->f_lasti = INSTR_OFFSET();
a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	696 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	697
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	698 opcode = NEXTOP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	699 if (HAS_ARG(opcode))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	700 oparg = NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	701 dispatch_opcode:
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	702 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	703 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	704 dxpairs[lastopcode][opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	705 lastopcode = opcode;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	706 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	707 dxp[opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	708 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	709
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	710 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	711 /* Instruction tracing */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	712
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	713 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	714 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	715 printf("%d: %d, %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	716 (int) (INSTR_OFFSET() - 3),
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	717 opcode, oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	718 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	719 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	720 printf("%d: %d\n",
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	721 (int) (INSTR_OFFSET() - 1), opcode);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	722 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	723 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	724 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	725 /* Main switch on opcode */
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	726
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	727 switch (opcode) {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	728
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	729 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	730 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	731 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	732 and that no operation that succeeds does this! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	733
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	734 /* case STOP_CODE: this is an error! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	735
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	736 case SET_LINENO:
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	737 #ifdef LLTRACE
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	738 if (lltrace)
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	739 printf("--- %s:%d \n", filename, oparg);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	740 #endif
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	741 f->f_lineno = oparg;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	742 if (tstate->c_tracefunc == NULL \|\| tstate->tracing)
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	743 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	744 /* Trace each line of code reached */
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	745 f->f_lasti = INSTR_OFFSET();
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	746 /* Inline call_trace() for performance: */
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	747 tstate->tracing++;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	748 tstate->use_tracing = 0;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	749 err = (tstate->c_tracefunc)(tstate->c_traceobj, f,
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	750 PyTrace_LINE, Py_None);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	751 tstate->use_tracing = (tstate->c_tracefunc
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	752 \|\| tstate->c_profilefunc);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	753 tstate->tracing--;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	754 break;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	755
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	756 case LOAD_FAST:
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	757 x = GETLOCAL(oparg);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	758 if (x != NULL) {
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	759 Py_INCREF(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	760 PUSH(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	761 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	762 }
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	763 format_exc_check_arg(PyExc_UnboundLocalError,
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	764 UNBOUNDLOCAL_ERROR_MSG,
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	765 PyTuple_GetItem(co->co_varnames, oparg));
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	766 break;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	767
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	768 case LOAD_CONST:
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	769 x = GETCONST(oparg);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	770 Py_INCREF(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	771 PUSH(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	772 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	773
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	774 case STORE_FAST:
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	775 v = POP();
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	776 SETLOCAL(oparg, v);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	777 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	778
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	779 case POP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	780 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	781 Py_DECREF(v);
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	782 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	783
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	784 case ROT_TWO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	785 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	786 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	787 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	788 PUSH(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	789 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	790
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	791 case ROT_THREE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	792 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	793 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	794 x = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	795 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	796 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	797 PUSH(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	798 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	799
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	800 case ROT_FOUR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	801 u = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	802 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	803 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	804 x = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	805 PUSH(u);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	806 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	807 PUSH(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	808 PUSH(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	809 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	810
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	811 case DUP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	812 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	813 Py_INCREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	814 PUSH(v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	815 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	816
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	817 case DUP_TOPX:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	818 switch (oparg) {
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	819 case 1:
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	820 x = TOP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	821 Py_INCREF(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	822 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	823 continue;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	824 case 2:
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	825 x = POP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	826 Py_INCREF(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	827 w = TOP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	828 Py_INCREF(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	829 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	830 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	831 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	832 continue;
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	833 case 3:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	834 x = POP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	835 Py_INCREF(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	836 w = POP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	837 Py_INCREF(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	838 v = TOP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	839 Py_INCREF(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	840 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	841 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	842 PUSH(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	843 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	844 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	845 continue;
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	846 case 4:
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	847 x = POP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	848 Py_INCREF(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	849 w = POP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	850 Py_INCREF(w);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	851 v = POP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	852 Py_INCREF(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	853 u = TOP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	854 Py_INCREF(u);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	855 PUSH(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	856 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	857 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	858 PUSH(u);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	859 PUSH(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	860 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	861 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	862 continue;
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	863 case 5:
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	864 x = POP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	865 Py_INCREF(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	866 w = POP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	867 Py_INCREF(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	868 v = POP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	869 Py_INCREF(v);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	870 u = POP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	871 Py_INCREF(u);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	872 t = TOP();
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	873 Py_INCREF(t);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	874 PUSH(u);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	875 PUSH(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	876 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	877 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	878 PUSH(t);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	879 PUSH(u);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	880 PUSH(v);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	881 PUSH(w);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	882 PUSH(x);
ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	883 continue;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	884 default:
15166 e61e64d1b5ec Do a better job at staying on-screen :P (Sorry, it's late here.) I'm Thomas Wouters <thomas@python.org> parents: 15165 diff changeset	885 Py_FatalError("invalid argument to DUP_TOPX"
e61e64d1b5ec Do a better job at staying on-screen :P (Sorry, it's late here.) I'm Thomas Wouters <thomas@python.org> parents: 15165 diff changeset	886 " (bytecode corruption?)");
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	887 }
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	888 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	889
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	890 case UNARY_POSITIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	891 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	892 x = PyNumber_Positive(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	893 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	894 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	895 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	896 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	897
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	898 case UNARY_NEGATIVE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	899 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	900 x = PyNumber_Negative(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	901 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	902 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	903 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	904 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	905
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	906 case UNARY_NOT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	907 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	908 err = PyObject_IsTrue(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	909 Py_DECREF(v);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	910 if (err == 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	911 Py_INCREF(Py_True);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	912 PUSH(Py_True);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	913 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	914 }
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	915 else if (err > 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	916 Py_INCREF(Py_False);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	917 PUSH(Py_False);
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	918 err = 0;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	919 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	920 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	921 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	922
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	923 case UNARY_CONVERT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	924 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	925 x = PyObject_Repr(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	926 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	927 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	928 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	929 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	930
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	931 case UNARY_INVERT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	932 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	933 x = PyNumber_Invert(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	934 Py_DECREF(v);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	935 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	936 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	937 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	938
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	939 case BINARY_POWER:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	940 w = POP();
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	941 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	942 x = PyNumber_Power(v, w, Py_None);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	943 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	944 Py_DECREF(w);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	945 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	946 if (x != NULL) continue;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	947 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	948
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	949 case BINARY_MULTIPLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	950 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	951 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	952 x = PyNumber_Multiply(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	953 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	954 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	955 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	956 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	957 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	958
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	959 case BINARY_DIVIDE:
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	960 if (!_Py_QnewFlag) {
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	961 w = POP();
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	962 v = POP();
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	963 x = PyNumber_Divide(v, w);
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	964 Py_DECREF(v);
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	965 Py_DECREF(w);
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	966 PUSH(x);
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	967 if (x != NULL) continue;
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	968 break;
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	969 }
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	970 /* -Qnew is in effect: fall through to
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	971 BINARY_TRUE_DIVIDE */
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	972 case BINARY_TRUE_DIVIDE:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	973 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	974 v = POP();
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	975 x = PyNumber_TrueDivide(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	976 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	977 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	978 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	979 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	980 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	981
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	982 case BINARY_FLOOR_DIVIDE:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	983 w = POP();
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	984 v = POP();
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	985 x = PyNumber_FloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	986 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	987 Py_DECREF(w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	988 PUSH(x);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	989 if (x != NULL) continue;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	990 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	991
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	992 case BINARY_MODULO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	993 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	994 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	995 x = PyNumber_Remainder(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	996 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	997 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	998 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	999 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1000 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1001
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1002 case BINARY_ADD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1003 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1004 v = POP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1005 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1006 /* INLINE: int + int */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1007 register long a, b, i;
9591 7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1008 a = PyInt_AS_LONG(v);
7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1009 b = PyInt_AS_LONG(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1010 i = a + b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1011 if ((i^a) < 0 && (i^b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1012 goto slow_add;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1013 x = PyInt_FromLong(i);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1014 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1015 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1016 slow_add:
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1017 x = PyNumber_Add(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1018 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1019 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1020 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1021 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1022 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1023 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1024
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1025 case BINARY_SUBTRACT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1026 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1027 v = POP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1028 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1029 /* INLINE: int - int */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1030 register long a, b, i;
9591 7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1031 a = PyInt_AS_LONG(v);
7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1032 b = PyInt_AS_LONG(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1033 i = a - b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1034 if ((i^a) < 0 && (i^~b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1035 goto slow_sub;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1036 x = PyInt_FromLong(i);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1037 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1038 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1039 slow_sub:
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1040 x = PyNumber_Subtract(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1041 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1042 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1043 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1044 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1045 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1046 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1047
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1048 case BINARY_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1049 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1050 v = POP();
20275 167e7f98b51f Introduced the oddly-missing PyList_CheckExact(), and used it to replace Tim Peters <tim.peters@gmail.com> parents: 20273 diff changeset	1051 if (PyList_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1052 /* INLINE: list[int] */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1053 long i = PyInt_AsLong(w);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1054 if (i < 0)
8652 97a1108b0eb2 # In case BINARY_SUBSCR, use proper PyList_GET* macros instead of inlining. Guido van Rossum <guido@python.org> parents: 8651 diff changeset	1055 i += PyList_GET_SIZE(v);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1056 if (i < 0 \|\|
8652 97a1108b0eb2 # In case BINARY_SUBSCR, use proper PyList_GET* macros instead of inlining. Guido van Rossum <guido@python.org> parents: 8651 diff changeset	1057 i >= PyList_GET_SIZE(v)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1058 PyErr_SetString(PyExc_IndexError,
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1059 "list index out of range");
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1060 x = NULL;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1061 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1062 else {
8652 97a1108b0eb2 # In case BINARY_SUBSCR, use proper PyList_GET* macros instead of inlining. Guido van Rossum <guido@python.org> parents: 8651 diff changeset	1063 x = PyList_GET_ITEM(v, i);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1064 Py_INCREF(x);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1065 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1066 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1067 else
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1068 x = PyObject_GetItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1069 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1070 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1071 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1072 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1073 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1074
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1075 case BINARY_LSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1076 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1077 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1078 x = PyNumber_Lshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1079 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1080 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1081 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1082 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1083 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1084
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1085 case BINARY_RSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1086 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1087 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1088 x = PyNumber_Rshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1089 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1090 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1091 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1092 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1093 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1094
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1095 case BINARY_AND:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1096 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1097 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1098 x = PyNumber_And(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1099 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1100 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1101 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1102 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1103 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1104
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1105 case BINARY_XOR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1106 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1107 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1108 x = PyNumber_Xor(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1109 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1110 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1111 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1112 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1113 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1114
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1115 case BINARY_OR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1116 w = POP();
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1117 v = POP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1118 x = PyNumber_Or(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1119 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1120 Py_DECREF(w);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1121 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1122 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1123 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1124
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1125 case INPLACE_POWER:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1126 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1127 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1128 x = PyNumber_InPlacePower(v, w, Py_None);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1129 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1130 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1131 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1132 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1133 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1134
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1135 case INPLACE_MULTIPLY:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1136 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1137 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1138 x = PyNumber_InPlaceMultiply(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1139 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1140 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1141 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1142 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1143 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1144
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1145 case INPLACE_DIVIDE:
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1146 if (!_Py_QnewFlag) {
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1147 w = POP();
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1148 v = POP();
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1149 x = PyNumber_InPlaceDivide(v, w);
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1150 Py_DECREF(v);
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1151 Py_DECREF(w);
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1152 PUSH(x);
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1153 if (x != NULL) continue;
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1154 break;
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1155 }
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1156 /* -Qnew is in effect: fall through to
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1157 INPLACE_TRUE_DIVIDE */
ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1158 case INPLACE_TRUE_DIVIDE:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1159 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1160 v = POP();
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1161 x = PyNumber_InPlaceTrueDivide(v, w);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1162 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1163 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1164 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1165 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1166 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1167
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1168 case INPLACE_FLOOR_DIVIDE:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1169 w = POP();
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1170 v = POP();
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1171 x = PyNumber_InPlaceFloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1172 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1173 Py_DECREF(w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1174 PUSH(x);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1175 if (x != NULL) continue;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1176 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1177
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1178 case INPLACE_MODULO:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1179 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1180 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1181 x = PyNumber_InPlaceRemainder(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1182 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1183 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1184 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1185 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1186 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1187
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1188 case INPLACE_ADD:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1189 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1190 v = POP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1191 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1192 /* INLINE: int + int */
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1193 register long a, b, i;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1194 a = PyInt_AS_LONG(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1195 b = PyInt_AS_LONG(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1196 i = a + b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1197 if ((i^a) < 0 && (i^b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1198 goto slow_iadd;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1199 x = PyInt_FromLong(i);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1200 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1201 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1202 slow_iadd:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1203 x = PyNumber_InPlaceAdd(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1204 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1205 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1206 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1207 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1208 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1209 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1210
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1211 case INPLACE_SUBTRACT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1212 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1213 v = POP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1214 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1215 /* INLINE: int - int */
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1216 register long a, b, i;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1217 a = PyInt_AS_LONG(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1218 b = PyInt_AS_LONG(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1219 i = a - b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1220 if ((i^a) < 0 && (i^~b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1221 goto slow_isub;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1222 x = PyInt_FromLong(i);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1223 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1224 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1225 slow_isub:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1226 x = PyNumber_InPlaceSubtract(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1227 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1228 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1229 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1230 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1231 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1232 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1233
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1234 case INPLACE_LSHIFT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1235 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1236 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1237 x = PyNumber_InPlaceLshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1238 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1239 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1240 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1241 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1242 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1243
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1244 case INPLACE_RSHIFT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1245 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1246 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1247 x = PyNumber_InPlaceRshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1248 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1249 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1250 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1251 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1252 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1253
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1254 case INPLACE_AND:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1255 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1256 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1257 x = PyNumber_InPlaceAnd(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1258 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1259 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1260 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1261 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1262 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1263
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1264 case INPLACE_XOR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1265 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1266 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1267 x = PyNumber_InPlaceXor(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1268 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1269 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1270 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1271 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1272 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1273
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1274 case INPLACE_OR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1275 w = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1276 v = POP();
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1277 x = PyNumber_InPlaceOr(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1278 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1279 Py_DECREF(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1280 PUSH(x);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1281 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1282 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1283
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1284 case SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1285 case SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1286 case SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1287 case SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1288 if ((opcode-SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1289 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1290 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1291 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1292 if ((opcode-SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1293 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1294 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1295 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1296 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1297 x = apply_slice(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1298 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1299 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1300 Py_XDECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1301 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1302 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1303 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1304
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1305 case STORE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1306 case STORE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1307 case STORE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1308 case STORE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1309 if ((opcode-STORE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1310 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1311 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1312 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1313 if ((opcode-STORE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1314 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1315 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1316 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1317 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1318 t = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1319 err = assign_slice(u, v, w, t); /* u[v:w] = t */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1320 Py_DECREF(t);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1321 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1322 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1323 Py_XDECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1324 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1325 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1326
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1327 case DELETE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1328 case DELETE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1329 case DELETE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1330 case DELETE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1331 if ((opcode-DELETE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1332 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1333 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1334 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1335 if ((opcode-DELETE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1336 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1337 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1338 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1339 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1340 err = assign_slice(u, v, w, (PyObject *)NULL);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1341 /* del u[v:w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1342 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1343 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1344 Py_XDECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1345 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1346 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1347
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1348 case STORE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1349 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1350 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1351 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1352 /* v[w] = u */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1353 err = PyObject_SetItem(v, w, u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1354 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1355 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1356 Py_DECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1357 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1358 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1359
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1360 case DELETE_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1361 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1362 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1363 /* del v[w] */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1364 err = PyObject_DelItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1365 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1366 Py_DECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1367 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1368 break;
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1369
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1370 case PRINT_EXPR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1371 v = POP();
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1372 w = PySys_GetObject("displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1373 if (w == NULL) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1374 PyErr_SetString(PyExc_RuntimeError,
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1375 "lost sys.displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1376 err = -1;
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1377 x = NULL;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1378 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1379 if (err == 0) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1380 x = Py_BuildValue("(O)", v);
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1381 if (x == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1382 err = -1;
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1383 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1384 if (err == 0) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1385 w = PyEval_CallObject(w, x);
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1386 Py_XDECREF(w);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1387 if (w == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1388 err = -1;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1389 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1390 Py_DECREF(v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1391 Py_XDECREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1392 break;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1393
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1394 case PRINT_ITEM_TO:
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1395 w = stream = POP();
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1396 /* fall through to PRINT_ITEM */
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1397
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1398 case PRINT_ITEM:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1399 v = POP();
14238 74f7f237f739 eval_code2(): Guido provides this patch for his suggested elaboration Barry Warsaw <barry@python.org> parents: 14232 diff changeset	1400 if (stream == NULL \|\| stream == Py_None) {
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1401 w = PySys_GetObject("stdout");
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1402 if (w == NULL) {
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1403 PyErr_SetString(PyExc_RuntimeError,
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1404 "lost sys.stdout");
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1405 err = -1;
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1406 }
7014 c75d899e666f Last-minute fix for Jim H: don't die after del sys.stdout Guido van Rossum <guido@python.org> parents: 6945 diff changeset	1407 }
22499 3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1408 if (w != NULL && PyFile_SoftSpace(w, 0))
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	1409 err = PyFile_WriteString(" ", w);
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	1410 if (err == 0)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	1411 err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
21027 dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1412 if (err == 0) {
22499 3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1413 /* XXX move into writeobject() ? */
21027 dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1414 if (PyString_Check(v)) {
dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1415 char *s = PyString_AS_STRING(v);
dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1416 int len = PyString_GET_SIZE(v);
22499 3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1417 if (len == 0 \|\|
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1418 !isspace(Py_CHARMASK(s[len-1])) \|\|
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1419 s[len-1] == ' ')
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1420 PyFile_SoftSpace(w, 1);
21027 dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1421 }
21475 aac23331a25d Patch #494384: Disable more Unicode API if Unicode is not used. Martin v. Löwis <martin@v.loewis.de> parents: 21441 diff changeset	1422 #ifdef Py_USING_UNICODE
21027 dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1423 else if (PyUnicode_Check(v)) {
dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1424 Py_UNICODE *s = PyUnicode_AS_UNICODE(v);
dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1425 int len = PyUnicode_GET_SIZE(v);
22499 3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1426 if (len == 0 \|\|
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1427 !Py_UNICODE_ISSPACE(s[len-1]) \|\|
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1428 s[len-1] == ' ')
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1429 PyFile_SoftSpace(w, 1);
21027 dee0e866653e Fix for bug #480188: printing unicode objects Marc-André Lemburg <mal@egenix.com> parents: 20915 diff changeset	1430 }
22499 3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1431 else
3a3de6567f1a SF bug 480215: softspace confused in nested print Tim Peters <tim.peters@gmail.com> parents: 22468 diff changeset	1432 PyFile_SoftSpace(w, 1);
21475 aac23331a25d Patch #494384: Disable more Unicode API if Unicode is not used. Martin v. Löwis <martin@v.loewis.de> parents: 21441 diff changeset	1433 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1434 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1435 Py_DECREF(v);
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1436 Py_XDECREF(stream);
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1437 stream = NULL;
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1438 if (err == 0)
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1439 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1440 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1441
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1442 case PRINT_NEWLINE_TO:
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1443 w = stream = POP();
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1444 /* fall through to PRINT_NEWLINE */
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1445
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1446 case PRINT_NEWLINE:
14238 74f7f237f739 eval_code2(): Guido provides this patch for his suggested elaboration Barry Warsaw <barry@python.org> parents: 14232 diff changeset	1447 if (stream == NULL \|\| stream == Py_None) {
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1448 w = PySys_GetObject("stdout");
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1449 if (w == NULL)
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1450 PyErr_SetString(PyExc_RuntimeError,
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1451 "lost sys.stdout");
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1452 }
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1453 if (w != NULL) {
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1454 err = PyFile_WriteString("\n", w);
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	1455 if (err == 0)
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1456 PyFile_SoftSpace(w, 0);
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1016 diff changeset	1457 }
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1458 Py_XDECREF(stream);
2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1459 stream = NULL;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1460 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1461
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1462
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1463 #ifdef CASE_TOO_BIG
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1464 default: switch (opcode) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1465 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1466 case BREAK_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1467 why = WHY_BREAK;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1468 break;
17114 6fe13d008e25 Use PyObject_IsInstance() to check whether the first argument to an Guido van Rossum <guido@python.org> parents: 17104 diff changeset	1469
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1470 case CONTINUE_LOOP:
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1471 retval = PyInt_FromLong(oparg);
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1472 why = WHY_CONTINUE;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1473 break;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1474
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1475 case RAISE_VARARGS:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1476 u = v = w = NULL;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1477 switch (oparg) {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1478 case 3:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1479 u = POP(); /* traceback */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1480 /* Fallthrough */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1481 case 2:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1482 v = POP(); /* value */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1483 /* Fallthrough */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1484 case 1:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1485 w = POP(); /* exc */
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	1486 case 0: /* Fallthrough */
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1487 why = do_raise(w, v, u);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1488 break;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1489 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1490 PyErr_SetString(PyExc_SystemError,
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1491 "bad RAISE_VARARGS oparg");
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1492 why = WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1493 break;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1494 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1495 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1496
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1497 case LOAD_LOCALS:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1498 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1499 PyErr_SetString(PyExc_SystemError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1500 "no locals");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1501 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1502 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1503 Py_INCREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1504 PUSH(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1505 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1506
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1507 case RETURN_VALUE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1508 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1509 why = WHY_RETURN;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1510 break;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1511
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1512 case YIELD_VALUE:
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1513 retval = POP();
18237 f02605b8fdc1 PyFrameObject: rename f_stackbottom to f_stacktop, since it points to Tim Peters <tim.peters@gmail.com> parents: 18195 diff changeset	1514 f->f_stacktop = stack_pointer;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1515 f->f_lasti = INSTR_OFFSET();
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1516 why = WHY_YIELD;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1517 break;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1518
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1519
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1520 case EXEC_STMT:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1521 w = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1522 v = POP();
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1523 u = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1524 err = exec_statement(f, u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1525 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1526 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1527 Py_DECREF(w);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1528 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1529
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1530 case POP_BLOCK:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1531 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1532 PyTryBlock *b = PyFrame_BlockPop(f);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1533 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	1534 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1535 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1536 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1537 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1538 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1539
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1540 case END_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1541 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1542 if (PyInt_Check(v)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1543 why = (enum why_code) PyInt_AsLong(v);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1544 if (why == WHY_RETURN \|\|
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1545 why == WHY_YIELD \|\|
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1546 why == CONTINUE_LOOP)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1547 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1548 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1549 else if (PyString_Check(v) \|\| PyClass_Check(v)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1550 w = POP();
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1551 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1552 PyErr_Restore(v, w, u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1553 why = WHY_RERAISE;
2872 d3b07ba3e12d fix bogus DECREF in finally clause Guido van Rossum <guido@python.org> parents: 2866 diff changeset	1554 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1555 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1556 else if (v != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1557 PyErr_SetString(PyExc_SystemError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1558 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1559 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1560 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1561 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1562 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1563
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1564 case BUILD_CLASS:
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1565 u = POP();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1566 v = POP();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1567 w = POP();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1568 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	1569 PUSH(x);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1570 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1571 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1572 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1573 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1574
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1575 case STORE_NAME:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1576 w = GETNAMEV(oparg);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1577 v = POP();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1578 if ((x = f->f_locals) == NULL) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1579 PyErr_Format(PyExc_SystemError,
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1580 "no locals found when storing %s",
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16365 diff changeset	1581 PyObject_REPR(w));
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1582 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1583 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1584 err = PyDict_SetItem(x, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1585 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1586 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1587
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1588 case DELETE_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1589 w = GETNAMEV(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1590 if ((x = f->f_locals) == NULL) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1591 PyErr_Format(PyExc_SystemError,
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1592 "no locals when deleting %s",
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16365 diff changeset	1593 PyObject_REPR(w));
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1594 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1595 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1596 if ((err = PyDict_DelItem(x, w)) != 0)
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1597 format_exc_check_arg(PyExc_NameError,
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1598 NAME_ERROR_MSG ,w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1599 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1600
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13881 diff changeset	1601 case UNPACK_SEQUENCE:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1602 v = POP();
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1603 if (PyTuple_Check(v)) {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1604 if (PyTuple_Size(v) != oparg) {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1605 PyErr_SetString(PyExc_ValueError,
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1606 "unpack tuple of wrong size");
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1607 why = WHY_EXCEPTION;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1608 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1609 else {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1610 for (; --oparg >= 0; ) {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1611 w = PyTuple_GET_ITEM(v, oparg);
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1612 Py_INCREF(w);
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1613 PUSH(w);
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1614 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1615 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1616 }
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1617 else if (PyList_Check(v)) {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1618 if (PyList_Size(v) != oparg) {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1619 PyErr_SetString(PyExc_ValueError,
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1620 "unpack list of wrong size");
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1621 why = WHY_EXCEPTION;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1622 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1623 else {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1624 for (; --oparg >= 0; ) {
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1625 w = PyList_GET_ITEM(v, oparg);
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1626 Py_INCREF(w);
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1627 PUSH(w);
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1628 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1629 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1630 }
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	1631 else if (unpack_iterable(v, oparg,
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	1632 stack_pointer + oparg))
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	1633 stack_pointer += oparg;
20183 c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1634 else {
c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1635 if (PyErr_ExceptionMatches(PyExc_TypeError))
c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1636 PyErr_SetString(PyExc_TypeError,
c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1637 "unpack non-sequence");
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1638 why = WHY_EXCEPTION;
20183 c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1639 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1640 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1641 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1642
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1643 case STORE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1644 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1645 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1646 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1647 err = PyObject_SetAttr(v, w, u); /* v.w = u */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1648 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1649 Py_DECREF(u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1650 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1651
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1652 case DELETE_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1653 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1654 v = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1655 err = PyObject_SetAttr(v, w, (PyObject *)NULL);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1656 /* del v.w */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1657 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1658 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1659
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1660 case STORE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1661 w = GETNAMEV(oparg);
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1662 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1663 err = PyDict_SetItem(f->f_globals, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1664 Py_DECREF(v);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1665 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1666
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1667 case DELETE_GLOBAL:
90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1668 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1669 if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1670 format_exc_check_arg(
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1671 PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1672 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1673
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1674 case LOAD_NAME:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1675 w = GETNAMEV(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1676 if ((x = f->f_locals) == NULL) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1677 PyErr_Format(PyExc_SystemError,
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1678 "no locals when loading %s",
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16365 diff changeset	1679 PyObject_REPR(w));
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1680 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1681 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1682 x = PyDict_GetItem(x, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1683 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1684 x = PyDict_GetItem(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1685 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1686 x = PyDict_GetItem(f->f_builtins, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1687 if (x == NULL) {
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1688 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1689 PyExc_NameError,
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1690 NAME_ERROR_MSG ,w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1691 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1692 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1693 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1694 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1695 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1696 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1697 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1698
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1699 case LOAD_GLOBAL:
334 449f5e5d9af6 Changed many calls to dict stufff to dict2 variants. Guido van Rossum <guido@python.org> parents: 314 diff changeset	1700 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1701 x = PyDict_GetItem(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1702 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1703 x = PyDict_GetItem(f->f_builtins, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1704 if (x == NULL) {
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1705 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1706 PyExc_NameError,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1707 GLOBAL_NAME_ERROR_MSG ,w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1708 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1709 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1710 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1711 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1712 PUSH(x);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1713 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1714
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1715 case DELETE_FAST:
8318 ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1716 x = GETLOCAL(oparg);
ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1717 if (x == NULL) {
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1718 format_exc_check_arg(
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1719 PyExc_UnboundLocalError,
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1720 UNBOUNDLOCAL_ERROR_MSG,
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1721 PyTuple_GetItem(co->co_varnames, oparg)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1722 );
8318 ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1723 break;
ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1724 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1725 SETLOCAL(oparg, NULL);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1726 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1727
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1728 case LOAD_CLOSURE:
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	1729 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1730 Py_INCREF(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1731 PUSH(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1732 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1733
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1734 case LOAD_DEREF:
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	1735 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1736 w = PyCell_Get(x);
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1737 if (w == NULL) {
17494 a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1738 if (oparg < f->f_ncells) {
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1739 v = PyTuple_GetItem(co->co_cellvars,
2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1740 oparg);
17494 a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1741 format_exc_check_arg(
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1742 PyExc_UnboundLocalError,
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1743 UNBOUNDLOCAL_ERROR_MSG,
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1744 v);
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1745 } else {
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1746 v = PyTuple_GetItem(
2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1747 co->co_freevars,
2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1748 oparg - f->f_ncells);
17494 a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1749 format_exc_check_arg(
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1750 PyExc_NameError,
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1751 UNBOUNDFREE_ERROR_MSG,
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1752 v);
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	1753 }
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1754 err = -1;
2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1755 break;
2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1756 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1757 PUSH(w);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1758 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1759
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1760 case STORE_DEREF:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1761 w = POP();
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	1762 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1763 PyCell_Set(x, w);
17034 ba81d79dc3a3 Variety of small INC/DECREF patches that fix reported memory leaks Jeremy Hylton <jeremy@alum.mit.edu> parents: 16631 diff changeset	1764 Py_DECREF(w);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1765 continue;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1766
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1767 case BUILD_TUPLE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1768 x = PyTuple_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1769 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1770 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1771 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1772 PyTuple_SET_ITEM(x, oparg, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1773 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1774 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1775 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1776 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1777 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1778
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1779 case BUILD_LIST:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1780 x = PyList_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1781 if (x != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1782 for (; --oparg >= 0;) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1783 w = POP();
8811 e58a614fb8e4 In BUILD_LIST, use PyList_SET_ITEM() instead of PyList_SetItem(); and Guido van Rossum <guido@python.org> parents: 8652 diff changeset	1784 PyList_SET_ITEM(x, oparg, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1785 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1786 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1787 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1788 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1789 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1790
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1791 case BUILD_MAP:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1792 x = PyDict_New();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1793 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1794 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1795 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1796
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1797 case LOAD_ATTR:
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1798 w = GETNAMEV(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1799 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1800 x = PyObject_GetAttr(v, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1801 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1802 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1803 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1804 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1805
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1806 case COMPARE_OP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1807 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1808 v = POP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1809 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1810 /* INLINE: cmp(int, int) */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1811 register long a, b;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1812 register int res;
9591 7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1813 a = PyInt_AS_LONG(v);
7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1814 b = PyInt_AS_LONG(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1815 switch (oparg) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1816 case PyCmp_LT: res = a < b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1817 case PyCmp_LE: res = a <= b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1818 case PyCmp_EQ: res = a == b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1819 case PyCmp_NE: res = a != b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1820 case PyCmp_GT: res = a > b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1821 case PyCmp_GE: res = a >= b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1822 case PyCmp_IS: res = v == w; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1823 case PyCmp_IS_NOT: res = v != w; break;
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1824 default: goto slow_compare;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1825 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1826 x = res ? Py_True : Py_False;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1827 Py_INCREF(x);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1828 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1829 else {
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1830 slow_compare:
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1831 x = cmp_outcome(oparg, v, w);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1832 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1833 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1834 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1835 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1836 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1837 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1838
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1839 case IMPORT_NAME:
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1840 w = GETNAMEV(oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1841 x = PyDict_GetItemString(f->f_builtins, "__import__");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1842 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1843 PyErr_SetString(PyExc_ImportError,
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1844 "__import__ not found");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1845 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1846 }
14232 1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14225 diff changeset	1847 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1848 w = Py_BuildValue("(OOOO)",
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1849 w,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1850 f->f_globals,
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1851 f->f_locals == NULL ?
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1852 Py_None : f->f_locals,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1853 u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1854 Py_DECREF(u);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1855 if (w == NULL) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1856 x = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1857 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1858 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1859 x = PyEval_CallObject(x, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1860 Py_DECREF(w);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1861 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1862 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1863 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1864
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1865 case IMPORT_STAR:
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1866 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1867 PyFrame_FastToLocals(f);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1868 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1869 PyErr_SetString(PyExc_SystemError,
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1870 "no locals found during 'import *'");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1871 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1872 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1873 err = import_all_from(x, v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1874 PyFrame_LocalsToFast(f, 0);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1875 Py_DECREF(v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1876 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1877 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1878
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1879 case IMPORT_FROM:
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1880 w = GETNAMEV(oparg);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1881 v = TOP();
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1882 x = import_from(v, w);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1883 PUSH(x);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1884 if (x != NULL) continue;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1885 break;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	1886
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1887 case JUMP_FORWARD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1888 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1889 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1890
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1891 case JUMP_IF_FALSE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1892 err = PyObject_IsTrue(TOP());
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1893 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1894 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1895 else if (err == 0)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1896 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1897 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1898 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1899 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1900
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1901 case JUMP_IF_TRUE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1902 err = PyObject_IsTrue(TOP());
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1903 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1904 err = 0;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1905 JUMPBY(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1906 }
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1907 else if (err == 0)
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1908 ;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1909 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1910 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1911 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1912
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1913 case JUMP_ABSOLUTE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1914 JUMPTO(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1915 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1916
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1917 case GET_ITER:
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1918 /* before: [obj]; after [getiter(obj)] */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1919 v = POP();
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1920 x = PyObject_GetIter(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1921 Py_DECREF(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1922 if (x != NULL) {
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1923 PUSH(x);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1924 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1925 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1926 break;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1927
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1928 case FOR_ITER:
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1929 /* before: [iter]; after: [iter, iter()] or [] */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1930 v = TOP();
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1931 x = PyIter_Next(v);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1932 if (x != NULL) {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1933 PUSH(x);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1934 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1935 }
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17636 diff changeset	1936 if (!PyErr_Occurred()) {
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17636 diff changeset	1937 /* iterator ended normally */
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17636 diff changeset	1938 x = v = POP();
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1939 Py_DECREF(v);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1940 JUMPBY(oparg);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1941 continue;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1942 }
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	1943 break;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	1944
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1945 case FOR_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1946 /* for v in s: ...
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1947 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	1948 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	1949 but if loop exhausted:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1950 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	1951 w = POP(); /* Loop index */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1952 v = POP(); /* Sequence object */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1953 u = loop_subscript(v, w);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1954 if (u != NULL) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1955 PUSH(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1956 x = PyInt_FromLong(PyInt_AsLong(w)+1);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1957 PUSH(x);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1958 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1959 PUSH(u);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1960 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1961 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1962 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1963 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1964 Py_DECREF(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1965 /* 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	1966 but also an error: */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1967 if (PyErr_Occurred())
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1968 why = WHY_EXCEPTION;
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1969 else {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1970 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1971 continue;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1972 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1973 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1974 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1975
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1976 case SETUP_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1977 case SETUP_EXCEPT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1978 case SETUP_FINALLY:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1979 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	1980 STACK_LEVEL());
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1981 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1982
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1983 case CALL_FUNCTION:
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1984 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1985 int na = oparg & 0xff;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1986 int nk = (oparg>>8) & 0xff;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1987 int n = na + 2 * nk;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1988 PyObject **pfunc = stack_pointer - n - 1;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1989 PyObject func = pfunc;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1990 f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1991
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1992 /* Always dispatch PyCFunction first, because
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1993 these are presumed to be the most frequent
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1994 callable object.
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1995 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1996 if (PyCFunction_Check(func)) {
17855 d2d3f88661a3 Add a second special case to the inline function call code in eval_code2(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 17683 diff changeset	1997 int flags = PyCFunction_GET_FLAGS(func);
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	1998 if (nk != 0 \|\| (flags & METH_KEYWORDS))
17991 0769e11d9d5f Fix bug reported by Tim Peters on python-dev: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17855 diff changeset	1999 x = do_call(func, &stack_pointer,
0769e11d9d5f Fix bug reported by Tim Peters on python-dev: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17855 diff changeset	2000 na, nk);
0769e11d9d5f Fix bug reported by Tim Peters on python-dev: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17855 diff changeset	2001 else if (flags == METH_VARARGS) {
17855 d2d3f88661a3 Add a second special case to the inline function call code in eval_code2(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 17683 diff changeset	2002 PyObject *callargs;
d2d3f88661a3 Add a second special case to the inline function call code in eval_code2(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 17683 diff changeset	2003 callargs = load_args(&stack_pointer, na);
19198 3c1c9948ff65 Remove much dead code from ceval.c Jeremy Hylton <jeremy@alum.mit.edu> parents: 19158 diff changeset	2004 x = PyCFunction_Call(func, callargs, NULL);
17855 d2d3f88661a3 Add a second special case to the inline function call code in eval_code2(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 17683 diff changeset	2005 Py_XDECREF(callargs);
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	2006 } else
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	2007 x = fast_cfunction(func,
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	2008 &stack_pointer, na);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2009 } else {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2010 if (PyMethod_Check(func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2011 && PyMethod_GET_SELF(func) != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2012 /* optimize access to bound methods */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2013 PyObject *self = PyMethod_GET_SELF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2014 Py_INCREF(self);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2015 func = PyMethod_GET_FUNCTION(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2016 Py_INCREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2017 Py_DECREF(*pfunc);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2018 *pfunc = self;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2019 na++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2020 n++;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2021 } else
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2022 Py_INCREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2023 if (PyFunction_Check(func)) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2024 x = fast_function(func, &stack_pointer,
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2025 n, na, nk);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2026 } else {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2027 x = do_call(func, &stack_pointer,
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2028 na, nk);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2029 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2030 Py_DECREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2031 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2032
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2033 while (stack_pointer > pfunc) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2034 w = POP();
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2035 Py_DECREF(w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2036 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2037 PUSH(x);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2038 if (x != NULL)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2039 continue;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2040 break;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2041 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2042
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2043 case CALL_FUNCTION_VAR:
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2044 case CALL_FUNCTION_KW:
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2045 case CALL_FUNCTION_VAR_KW:
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	2046 {
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2047 int na = oparg & 0xff;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2048 int nk = (oparg>>8) & 0xff;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2049 int flags = (opcode - CALL_FUNCTION) & 3;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2050 int n = na + 2 * nk;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2051 PyObject *pfunc, func;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2052 if (flags & CALL_FLAG_VAR)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2053 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2054 if (flags & CALL_FLAG_KW)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2055 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2056 pfunc = stack_pointer - n - 1;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2057 func = *pfunc;
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2058 f->f_lasti = INSTR_OFFSET() - 3; /* For tracing */
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2059
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2060 if (PyMethod_Check(func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2061 && PyMethod_GET_SELF(func) != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2062 PyObject *self = PyMethod_GET_SELF(func);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2063 Py_INCREF(self);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2064 func = PyMethod_GET_FUNCTION(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2065 Py_INCREF(func);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2066 Py_DECREF(*pfunc);
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2067 *pfunc = self;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2068 na++;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2069 n++;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2070 } else
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2071 Py_INCREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2072 x = ext_do_call(func, &stack_pointer, flags, na, nk);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2073 Py_DECREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2074
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2075 while (stack_pointer > pfunc) {
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2076 w = POP();
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2077 Py_DECREF(w);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2078 }
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2079 PUSH(x);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2080 if (x != NULL)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2081 continue;
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2082 break;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	2083 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2084
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2085 case MAKE_FUNCTION:
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2086 v = POP(); /* code object */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2087 x = PyFunction_New(v, f->f_globals);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2088 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2089 /* XXX Maybe this should be a separate opcode? */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2090 if (x != NULL && oparg > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2091 v = PyTuple_New(oparg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2092 if (v == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2093 Py_DECREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2094 x = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2095 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2096 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2097 while (--oparg >= 0) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2098 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2099 PyTuple_SET_ITEM(v, oparg, w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2100 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2101 err = PyFunction_SetDefaults(x, v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2102 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2103 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2104 PUSH(x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2105 break;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2106
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2107 case MAKE_CLOSURE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2108 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2109 int nfree;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2110 v = POP(); /* code object */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2111 x = PyFunction_New(v, f->f_globals);
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21270 diff changeset	2112 nfree = PyCode_GetNumFree((PyCodeObject *)v);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2113 Py_DECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2114 /* XXX Maybe this should be a separate opcode? */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2115 if (x != NULL && nfree > 0) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2116 v = PyTuple_New(nfree);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2117 if (v == NULL) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2118 Py_DECREF(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2119 x = NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2120 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2121 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2122 while (--nfree >= 0) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2123 w = POP();
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2124 PyTuple_SET_ITEM(v, nfree, w);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2125 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2126 err = PyFunction_SetClosure(x, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2127 Py_DECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2128 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2129 if (x != NULL && oparg > 0) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2130 v = PyTuple_New(oparg);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2131 if (v == NULL) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2132 Py_DECREF(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2133 x = NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2134 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2135 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2136 while (--oparg >= 0) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2137 w = POP();
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2138 PyTuple_SET_ITEM(v, oparg, w);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2139 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2140 err = PyFunction_SetDefaults(x, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2141 Py_DECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2142 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2143 PUSH(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2144 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2145 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2146
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2147 case BUILD_SLICE:
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2148 if (oparg == 3)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2149 w = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2150 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2151 w = NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2152 v = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2153 u = POP();
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	2154 x = PySlice_New(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2155 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2156 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2157 Py_XDECREF(w);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2158 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2159 if (x != NULL) continue;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2160 break;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2161
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2162 case EXTENDED_ARG:
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2163 opcode = NEXTOP();
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2164 oparg = oparg<<16 \| NEXTARG();
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2165 goto dispatch_opcode;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2166
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2167 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2168 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2169 "XXX lineno: %d, opcode: %d\n",
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2170 f->f_lineno, opcode);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2171 PyErr_SetString(PyExc_SystemError, "unknown opcode");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2172 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2173 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2174
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2175 #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	2176 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2177 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2178
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2179 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2180
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2181 on_error:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2182
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2183 /* Quickly continue if no error occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2184
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2185 if (why == WHY_NOT) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2186 if (err == 0 && x != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2187 #ifdef CHECKEXC
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2188 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2189 if (PyErr_Occurred())
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2190 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2191 "XXX undetected error\n");
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2192 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2193 #endif
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2194 continue; /* Normal, fast path */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2195 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2196 why = WHY_EXCEPTION;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2197 x = Py_None;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2198 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2199 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2200
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2201 /* Double-check exception status */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2202
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2203 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2204 if (!PyErr_Occurred()) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2205 PyErr_SetString(PyExc_SystemError,
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2206 "error return without exception set");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2207 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2208 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2209 }
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2210 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2211 else {
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2212 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2213 if (PyErr_Occurred()) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2214 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2215 "XXX undetected error (why=%d)\n",
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2216 why);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2217 why = WHY_EXCEPTION;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2218 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2219 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2220 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2221
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2222 /* Log traceback info if this is a real exception */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2223
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2224 if (why == WHY_EXCEPTION) {
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2225 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	2226 if (HAS_ARG(opcode))
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2227 f->f_lasti -= 2;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2228 PyTraceBack_Here(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2229
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2230 if (tstate->c_tracefunc != NULL)
a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2231 call_exc_trace(tstate->c_tracefunc,
a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2232 tstate->c_traceobj, f);
9513 350f24180dcb Whoops! One the "redundant" initializations removed by Vladimir in Guido van Rossum <guido@python.org> parents: 9490 diff changeset	2233 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2234
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2235 /* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2236
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2237 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2238 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2239
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2240 /* Unwind stacks if a (pseudo) exception occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2241
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2242 while (why != WHY_NOT && why != WHY_YIELD && f->f_iblock > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2243 PyTryBlock *b = PyFrame_BlockPop(f);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2244
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2245 if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2246 /* For a continue inside a try block,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2247 don't pop the block for the loop. */
20064 ef3034a60a3e Don't swap the arguments to PyFrame_BlockSetup when recreating the recently Thomas Wouters <thomas@python.org> parents: 20012 diff changeset	2248 PyFrame_BlockSetup(f, b->b_type, b->b_handler,
ef3034a60a3e Don't swap the arguments to PyFrame_BlockSetup when recreating the recently Thomas Wouters <thomas@python.org> parents: 20012 diff changeset	2249 b->b_level);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2250 why = WHY_NOT;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2251 JUMPTO(PyInt_AS_LONG(retval));
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2252 Py_DECREF(retval);
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2253 break;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2254 }
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2255
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2256 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	2257 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2258 Py_XDECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2259 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2260 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	2261 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2262 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2263 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2264 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2265 if (b->b_type == SETUP_FINALLY \|\|
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2266 (b->b_type == SETUP_EXCEPT &&
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2267 why == WHY_EXCEPTION)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2268 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2269 PyObject exc, val, *tb;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2270 PyErr_Fetch(&exc, &val, &tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2271 if (val == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2272 val = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2273 Py_INCREF(val);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2274 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2275 /* Make the raw exception data
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2276 available to the handler,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2277 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	2278 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	2279 this for 'finally'. */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2280 if (b->b_type == SETUP_EXCEPT) {
6185 32aacd753f34 eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the Barry Warsaw <barry@python.org> parents: 6160 diff changeset	2281 PyErr_NormalizeException(
32aacd753f34 eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the Barry Warsaw <barry@python.org> parents: 6160 diff changeset	2282 &exc, &val, &tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2283 set_exc_info(tstate,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2284 exc, val, tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2285 }
20114 233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2286 if (tb == NULL) {
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2287 Py_INCREF(Py_None);
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2288 PUSH(Py_None);
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2289 } else
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2290 PUSH(tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2291 PUSH(val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2292 PUSH(exc);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2293 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2294 else {
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2295 if (why == WHY_RETURN \|\|
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2296 why == CONTINUE_LOOP)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2297 PUSH(retval);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2298 v = PyInt_FromLong((long)why);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2299 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2300 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2301 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2302 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2303 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2304 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2305 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2306
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2307 /* End the loop if we still have an error (or return) */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2308
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2309 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2310 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2311
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2312 } /* main loop */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2313
21270 97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2314 if (why != WHY_YIELD) {
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2315 /* Pop remaining stack entries -- but when yielding */
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2316 while (!EMPTY()) {
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2317 v = POP();
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2318 Py_XDECREF(v);
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2319 }
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2320 }
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2321
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2322 if (why != WHY_RETURN && why != WHY_YIELD)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2323 retval = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2324
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2325 if (tstate->use_tracing) {
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2326 if (tstate->c_tracefunc
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2327 && (why == WHY_RETURN \|\| why == WHY_YIELD)) {
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2328 if (call_trace(tstate->c_tracefunc,
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2329 tstate->c_traceobj, f,
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2330 PyTrace_RETURN, retval)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2331 Py_XDECREF(retval);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2332 retval = NULL;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2333 why = WHY_EXCEPTION;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2334 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2335 }
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2336 if (tstate->c_profilefunc) {
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2337 if (why == WHY_EXCEPTION)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2338 call_trace_protected(tstate->c_profilefunc,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2339 tstate->c_profileobj, f,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2340 PyTrace_RETURN);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2341 else if (call_trace(tstate->c_profilefunc,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2342 tstate->c_profileobj, f,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2343 PyTrace_RETURN, retval)) {
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2344 Py_XDECREF(retval);
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2345 retval = NULL;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2346 why = WHY_EXCEPTION;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2347 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2348 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2349 }
5023 75c1ee882a4a Kill all local variables on function return. This closes a gigantic Guido van Rossum <guido@python.org> parents: 5021 diff changeset	2350
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2351 reset_exc_info(tstate);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2352
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2353 /* pop frame */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2354 --tstate->recursion_depth;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2355 tstate->frame = f->f_back;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2356
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2357 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2358 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2359
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	2360 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	2361 PyEval_EvalCodeEx(PyCodeObject co, PyObject globals, PyObject *locals,
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2362 PyObject args, int argcount, PyObject kws, int kwcount,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2363 PyObject *defs, int defcount, PyObject closure)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2364 {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2365 register PyFrameObject *f;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2366 register PyObject *retval = NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2367 register PyObject fastlocals, freevars;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2368 PyThreadState *tstate = PyThreadState_GET();
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2369 PyObject x, u;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2370
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2371 if (globals == NULL) {
19198 3c1c9948ff65 Remove much dead code from ceval.c Jeremy Hylton <jeremy@alum.mit.edu> parents: 19158 diff changeset	2372 PyErr_SetString(PyExc_SystemError,
3c1c9948ff65 Remove much dead code from ceval.c Jeremy Hylton <jeremy@alum.mit.edu> parents: 19158 diff changeset	2373 "PyEval_EvalCodeEx: NULL globals");
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2374 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2375 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2376
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2377 f = PyFrame_New(tstate, /back/
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2378 co, /code/
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2379 globals, locals);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2380 if (f == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2381 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2382
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2383 fastlocals = f->f_localsplus;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2384 freevars = f->f_localsplus + f->f_nlocals;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2385
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2386 if (co->co_argcount > 0 \|\|
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2387 co->co_flags & (CO_VARARGS \| CO_VARKEYWORDS)) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2388 int i;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2389 int n = argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2390 PyObject *kwdict = NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2391 if (co->co_flags & CO_VARKEYWORDS) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2392 kwdict = PyDict_New();
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2393 if (kwdict == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2394 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2395 i = co->co_argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2396 if (co->co_flags & CO_VARARGS)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2397 i++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2398 SETLOCAL(i, kwdict);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2399 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2400 if (argcount > co->co_argcount) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2401 if (!(co->co_flags & CO_VARARGS)) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2402 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2403 "%.200s() takes %s %d "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2404 "%sargument%s (%d given)",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2405 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2406 defcount ? "at most" : "exactly",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2407 co->co_argcount,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2408 kwcount ? "non-keyword " : "",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2409 co->co_argcount == 1 ? "" : "s",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2410 argcount);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2411 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2412 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2413 n = co->co_argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2414 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2415 for (i = 0; i < n; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2416 x = args[i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2417 Py_INCREF(x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2418 SETLOCAL(i, x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2419 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2420 if (co->co_flags & CO_VARARGS) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2421 u = PyTuple_New(argcount - n);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2422 if (u == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2423 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2424 SETLOCAL(co->co_argcount, u);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2425 for (i = n; i < argcount; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2426 x = args[i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2427 Py_INCREF(x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2428 PyTuple_SET_ITEM(u, i-n, x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2429 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2430 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2431 for (i = 0; i < kwcount; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2432 PyObject keyword = kws[2i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2433 PyObject value = kws[2i + 1];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2434 int j;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2435 if (keyword == NULL \|\| !PyString_Check(keyword)) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2436 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2437 "%.200s() keywords must be strings",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2438 PyString_AsString(co->co_name));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2439 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2440 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2441 /* XXX slow -- speed up using dictionary? */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2442 for (j = 0; j < co->co_argcount; j++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2443 PyObject *nm = PyTuple_GET_ITEM(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2444 co->co_varnames, j);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2445 int cmp = PyObject_RichCompareBool(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2446 keyword, nm, Py_EQ);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2447 if (cmp > 0)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2448 break;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2449 else if (cmp < 0)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2450 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2451 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2452 /* Check errors from Compare */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2453 if (PyErr_Occurred())
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2454 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2455 if (j >= co->co_argcount) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2456 if (kwdict == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2457 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2458 "%.200s() got an unexpected "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2459 "keyword argument '%.400s'",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2460 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2461 PyString_AsString(keyword));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2462 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2463 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2464 PyDict_SetItem(kwdict, keyword, value);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2465 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2466 else {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2467 if (GETLOCAL(j) != NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2468 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2469 "%.200s() got multiple "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2470 "values for keyword "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2471 "argument '%.400s'",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2472 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2473 PyString_AsString(keyword));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2474 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2475 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2476 Py_INCREF(value);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2477 SETLOCAL(j, value);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2478 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2479 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2480 if (argcount < co->co_argcount) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2481 int m = co->co_argcount - defcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2482 for (i = argcount; i < m; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2483 if (GETLOCAL(i) == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2484 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2485 "%.200s() takes %s %d "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2486 "%sargument%s (%d given)",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2487 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2488 ((co->co_flags & CO_VARARGS) \|\|
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2489 defcount) ? "at least"
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2490 : "exactly",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2491 m, kwcount ? "non-keyword " : "",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2492 m == 1 ? "" : "s", i);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2493 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2494 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2495 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2496 if (n > m)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2497 i = n - m;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2498 else
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2499 i = 0;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2500 for (; i < defcount; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2501 if (GETLOCAL(m+i) == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2502 PyObject *def = defs[i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2503 Py_INCREF(def);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2504 SETLOCAL(m+i, def);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2505 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2506 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2507 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2508 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2509 else {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2510 if (argcount > 0 \|\| kwcount > 0) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2511 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2512 "%.200s() takes no arguments (%d given)",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2513 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2514 argcount + kwcount);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2515 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2516 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2517 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2518 /* Allocate and initialize storage for cell vars, and copy free
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2519 vars into frame. This isn't too efficient right now. */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2520 if (f->f_ncells) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2521 int i = 0, j = 0, nargs, found;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2522 char cellname, argname;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2523 PyObject *c;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2524
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2525 nargs = co->co_argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2526 if (co->co_flags & CO_VARARGS)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2527 nargs++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2528 if (co->co_flags & CO_VARKEYWORDS)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2529 nargs++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2530
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2531 /* Check for cells that shadow args */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2532 for (i = 0; i < f->f_ncells && j < nargs; ++i) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2533 cellname = PyString_AS_STRING(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2534 PyTuple_GET_ITEM(co->co_cellvars, i));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2535 found = 0;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2536 while (j < nargs) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2537 argname = PyString_AS_STRING(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2538 PyTuple_GET_ITEM(co->co_varnames, j));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2539 if (strcmp(cellname, argname) == 0) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2540 c = PyCell_New(GETLOCAL(j));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2541 if (c == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2542 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2543 GETLOCAL(f->f_nlocals + i) = c;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2544 found = 1;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2545 break;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2546 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2547 j++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2548 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2549 if (found == 0) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2550 c = PyCell_New(NULL);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2551 if (c == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2552 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2553 SETLOCAL(f->f_nlocals + i, c);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2554 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2555 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2556 /* Initialize any that are left */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2557 while (i < f->f_ncells) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2558 c = PyCell_New(NULL);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2559 if (c == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2560 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2561 SETLOCAL(f->f_nlocals + i, c);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2562 i++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2563 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2564 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2565 if (f->f_nfreevars) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2566 int i;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2567 for (i = 0; i < f->f_nfreevars; ++i) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2568 PyObject *o = PyTuple_GET_ITEM(closure, i);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2569 Py_INCREF(o);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2570 freevars[f->f_ncells + i] = o;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2571 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2572 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2573
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2574 if (co->co_flags & CO_GENERATOR) {
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2575 /* Don't need to keep the reference to f_back, it will be set
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2576 * when the generator is resumed. */
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2577 Py_XDECREF(f->f_back);
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2578 f->f_back = NULL;
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2579
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2580 /* Create a new generator that owns the ready to run frame
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2581 * and return that as the value. */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2582 return gen_new(f);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2583 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2584
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2585 retval = eval_frame(f);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2586
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2587 fail: /* Jump here from prelude on failure */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2588
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2589 /* decref'ing the frame can cause __del__ methods to get invoked,
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2590 which can call back into Python. While we're done with the
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2591 current Python frame (f), the associated C stack is still in use,
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2592 so recursion_depth must be boosted for the duration.
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2593 */
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2594 assert(tstate != NULL);
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2595 ++tstate->recursion_depth;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2596 Py_DECREF(f);
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2597 --tstate->recursion_depth;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2598 return retval;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2599 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2600
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2601
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2602 static void
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2603 set_exc_info(PyThreadState *tstate,
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2604 PyObject type, PyObject value, PyObject *tb)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2605 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2606 PyFrameObject *frame;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2607 PyObject tmp_type, tmp_value, *tmp_tb;
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2608
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2609 frame = tstate->frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2610 if (frame->f_exc_type == NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2611 /* This frame didn't catch an exception before */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2612 /* Save previous exception of this thread in this frame */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2613 if (tstate->exc_type == NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2614 Py_INCREF(Py_None);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2615 tstate->exc_type = Py_None;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2616 }
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2617 tmp_type = frame->f_exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2618 tmp_value = frame->f_exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2619 tmp_tb = frame->f_exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2620 Py_XINCREF(tstate->exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2621 Py_XINCREF(tstate->exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2622 Py_XINCREF(tstate->exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2623 frame->f_exc_type = tstate->exc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2624 frame->f_exc_value = tstate->exc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2625 frame->f_exc_traceback = tstate->exc_traceback;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2626 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2627 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2628 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2629 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2630 /* Set new exception for this thread */
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2631 tmp_type = tstate->exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2632 tmp_value = tstate->exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2633 tmp_tb = tstate->exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2634 Py_XINCREF(type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2635 Py_XINCREF(value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2636 Py_XINCREF(tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2637 tstate->exc_type = type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2638 tstate->exc_value = value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2639 tstate->exc_traceback = tb;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2640 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2641 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2642 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2643 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2644 PySys_SetObject("exc_type", type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2645 PySys_SetObject("exc_value", value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2646 PySys_SetObject("exc_traceback", tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2647 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2648
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2649 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2650 reset_exc_info(PyThreadState *tstate)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2651 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2652 PyFrameObject *frame;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2653 PyObject tmp_type, tmp_value, *tmp_tb;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2654 frame = tstate->frame;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2655 if (frame->f_exc_type != NULL) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2656 /* This frame caught an exception */
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2657 tmp_type = tstate->exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2658 tmp_value = tstate->exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2659 tmp_tb = tstate->exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2660 Py_XINCREF(frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2661 Py_XINCREF(frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2662 Py_XINCREF(frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2663 tstate->exc_type = frame->f_exc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2664 tstate->exc_value = frame->f_exc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2665 tstate->exc_traceback = frame->f_exc_traceback;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2666 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2667 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2668 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2669 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2670 PySys_SetObject("exc_type", frame->f_exc_type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2671 PySys_SetObject("exc_value", frame->f_exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2672 PySys_SetObject("exc_traceback", frame->f_exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2673 }
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2674 tmp_type = frame->f_exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2675 tmp_value = frame->f_exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2676 tmp_tb = frame->f_exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2677 frame->f_exc_type = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2678 frame->f_exc_value = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2679 frame->f_exc_traceback = NULL;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2680 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2681 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2682 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2683 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2684
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2685 /* Logic for the raise statement (too complicated for inlining).
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2686 This consumes a reference count to each of its arguments. */
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	2687 static enum why_code
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2688 do_raise(PyObject type, PyObject value, PyObject *tb)
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2689 {
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2690 if (type == NULL) {
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2691 /* Reraise */
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2692 PyThreadState *tstate = PyThreadState_Get();
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2693 type = tstate->exc_type == NULL ? Py_None : tstate->exc_type;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2694 value = tstate->exc_value;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2695 tb = tstate->exc_traceback;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2696 Py_XINCREF(type);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2697 Py_XINCREF(value);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2698 Py_XINCREF(tb);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2699 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2700
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2701 /* We support the following forms of raise:
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2702 raise <class>, <classinstance>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2703 raise <class>, <argument tuple>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2704 raise <class>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2705 raise <class>, <argument>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2706 raise <classinstance>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2707 raise <string>, <object>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2708 raise <string>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2709
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2710 An omitted second argument is the same as None.
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2711
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2712 In addition, raise <tuple>, <anything> is the same as
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2713 raising the tuple's first item (and it better have one!);
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2714 this rule is applied recursively.
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2715
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2716 Finally, an optional third argument can be supplied, which
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2717 gives the traceback to be substituted (useful when
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2718 re-raising an exception after examining it). */
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2719
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2720 /* First, check the traceback argument, replacing None with
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2721 NULL. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2722 if (tb == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2723 Py_DECREF(tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2724 tb = NULL;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2725 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2726 else if (tb != NULL && !PyTraceBack_Check(tb)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2727 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	2728 "raise: arg 3 must be a traceback or None");
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2729 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2730 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2731
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2732 /* Next, replace a missing value with None */
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2733 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2734 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2735 Py_INCREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2736 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2737
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2738 /* Next, repeatedly, replace a tuple exception with its first item */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2739 while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2740 PyObject *tmp = type;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2741 type = PyTuple_GET_ITEM(type, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2742 Py_INCREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2743 Py_DECREF(tmp);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2744 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2745
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2746 if (PyString_Check(type))
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2747 ;
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2748
b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2749 else if (PyClass_Check(type))
b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2750 PyErr_NormalizeException(&type, &value, &tb);
b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2751
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2752 else if (PyInstance_Check(type)) {
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2753 /* Raising an instance. The value should be a dummy. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2754 if (value != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2755 PyErr_SetString(PyExc_TypeError,
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2756 "instance exception may not have a separate value");
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2757 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2758 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2759 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2760 /* Normalize to raise <class>, <instance> */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2761 Py_DECREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2762 value = type;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2763 type = (PyObject) ((PyInstanceObject)type)->in_class;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2764 Py_INCREF(type);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2765 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2766 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2767 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2768 /* Not something you can raise. You get an exception
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2769 anyway, just not what you specified :-) */
17636 9921a9d27f72 improved error message-- names the type of the unexpected object Jeremy Hylton <jeremy@alum.mit.edu> parents: 17617 diff changeset	2770 PyErr_Format(PyExc_TypeError,
9921a9d27f72 improved error message-- names the type of the unexpected object Jeremy Hylton <jeremy@alum.mit.edu> parents: 17617 diff changeset	2771 "exceptions must be strings, classes, or "
9921a9d27f72 improved error message-- names the type of the unexpected object Jeremy Hylton <jeremy@alum.mit.edu> parents: 17617 diff changeset	2772 "instances, not %s", type->ob_type->tp_name);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2773 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2774 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2775 PyErr_Restore(type, value, tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2776 if (tb == NULL)
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2777 return WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2778 else
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2779 return WHY_RERAISE;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2780 raise_error:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2781 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2782 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2783 Py_XDECREF(tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2784 return WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2785 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2786
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2787 /* Iterate v argcnt times and store the results on the stack (via decreasing
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2788 sp). Return 1 for success, 0 if error. */
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2789
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2790 static int
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2791 unpack_iterable(PyObject v, int argcnt, PyObject *sp)
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2792 {
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2793 int i = 0;
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2794 PyObject it; / iter(v) */
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2795 PyObject *w;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2796
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2797 assert(v != NULL);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2798
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2799 it = PyObject_GetIter(v);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2800 if (it == NULL)
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2801 goto Error;
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2802
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2803 for (; i < argcnt; i++) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2804 w = PyIter_Next(it);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2805 if (w == NULL) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2806 /* Iterator done, via error or exhaustion. */
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2807 if (!PyErr_Occurred()) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2808 PyErr_Format(PyExc_ValueError,
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2809 "need more than %d value%s to unpack",
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2810 i, i == 1 ? "" : "s");
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2811 }
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2812 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2813 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2814 *--sp = w;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2815 }
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2816
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2817 /* We better have exhausted the iterator now. */
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2818 w = PyIter_Next(it);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2819 if (w == NULL) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2820 if (PyErr_Occurred())
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2821 goto Error;
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2822 Py_DECREF(it);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2823 return 1;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2824 }
21170 2dfc600f99ce unpack_iterable(): Add a missing DECREF in an error case. Reported by Guido van Rossum <guido@python.org> parents: 21058 diff changeset	2825 Py_DECREF(w);
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2826 PyErr_SetString(PyExc_ValueError, "too many values to unpack");
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2827 /* fall through */
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2828 Error:
6160 79592761b331 unpack_sequence(): In finally clause, watch out for Py_DECREF Barry Warsaw <barry@python.org> parents: 6157 diff changeset	2829 for (; i > 0; i--, sp++)
79592761b331 unpack_sequence(): In finally clause, watch out for Py_DECREF Barry Warsaw <barry@python.org> parents: 6157 diff changeset	2830 Py_DECREF(*sp);
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2831 Py_XDECREF(it);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2832 return 0;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2833 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2834
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2835
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2836 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2837 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2838 prtrace(PyObject v, char str)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2839 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2840 printf("%s ", str);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2841 if (PyObject_Print(v, stdout, 0) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2842 PyErr_Clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2843 printf("\n");
12579 978253542076 Add useless 'return 1' to prtrace() to shut up VC++. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	2844 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2845 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2846 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2847
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2848 static void
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2849 call_exc_trace(Py_tracefunc func, PyObject self, PyFrameObject f)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2850 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2851 PyObject type, value, traceback, arg;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2852 int err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2853 PyErr_Fetch(&type, &value, &traceback);
815 6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	2854 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2855 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2856 Py_INCREF(value);
815 6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	2857 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2858 arg = Py_BuildValue("(OOO)", type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2859 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2860 PyErr_Restore(type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2861 return;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2862 }
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2863 err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2864 Py_DECREF(arg);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2865 if (err == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2866 PyErr_Restore(type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2867 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2868 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2869 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2870 Py_XDECREF(traceback);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2871 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2872 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2873
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2874 static void
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2875 call_trace_protected(Py_tracefunc func, PyObject obj, PyFrameObject frame,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2876 int what)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2877 {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2878 PyObject type, value, *traceback;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2879 int err;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2880 PyErr_Fetch(&type, &value, &traceback);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2881 err = call_trace(func, obj, frame, what, NULL);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2882 if (err == 0)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2883 PyErr_Restore(type, value, traceback);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2884 else {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2885 Py_XDECREF(type);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2886 Py_XDECREF(value);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2887 Py_XDECREF(traceback);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2888 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2889 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2890
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2891 static int
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2892 call_trace(Py_tracefunc func, PyObject obj, PyFrameObject frame,
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2893 int what, PyObject *arg)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2894 {
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2895 register PyThreadState *tstate = frame->f_tstate;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2896 int result;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2897 if (tstate->tracing)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2898 return 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2899 tstate->tracing++;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2900 tstate->use_tracing = 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2901 result = func(obj, frame, what, arg);
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2902 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2903 \|\| (tstate->c_profilefunc != NULL));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2904 tstate->tracing--;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2905 return result;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2906 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2907
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2908 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2909 PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
18136 4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	2910 {
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2911 PyThreadState *tstate = PyThreadState_Get();
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2912 PyObject *temp = tstate->c_profileobj;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2913 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2914 tstate->c_profilefunc = NULL;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2915 tstate->c_profileobj = NULL;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2916 tstate->use_tracing = tstate->c_tracefunc != NULL;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2917 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2918 tstate->c_profilefunc = func;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2919 tstate->c_profileobj = arg;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2920 tstate->use_tracing = (func != NULL) \|\| (tstate->c_tracefunc != NULL);
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2921 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2922
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2923 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2924 PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2925 {
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2926 PyThreadState *tstate = PyThreadState_Get();
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2927 PyObject *temp = tstate->c_traceobj;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2928 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2929 tstate->c_tracefunc = NULL;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2930 tstate->c_traceobj = NULL;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2931 tstate->use_tracing = tstate->c_profilefunc != NULL;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2932 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2933 tstate->c_tracefunc = func;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	2934 tstate->c_traceobj = arg;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2935 tstate->use_tracing = ((func != NULL)
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2936 \|\| (tstate->c_profilefunc != NULL));
18136 4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	2937 }
4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	2938
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2939 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2940 PyEval_GetBuiltins(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2941 {
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	2942 PyThreadState *tstate = PyThreadState_Get();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	2943 PyFrameObject *current_frame = tstate->frame;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2944 if (current_frame == NULL)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	2945 return tstate->interp->builtins;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2946 else
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2947 return current_frame->f_builtins;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2948 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2949
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2950 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2951 PyEval_GetLocals(void)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2952 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2953 PyFrameObject *current_frame = PyThreadState_Get()->frame;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2954 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	2955 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2956 PyFrame_FastToLocals(current_frame);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2957 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	2958 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	2959
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2960 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2961 PyEval_GetGlobals(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2962 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2963 PyFrameObject *current_frame = PyThreadState_Get()->frame;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2964 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2965 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2966 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2967 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2968 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2969
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2970 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2971 PyEval_GetFrame(void)
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2972 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2973 PyFrameObject *current_frame = PyThreadState_Get()->frame;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2974 return (PyObject *)current_frame;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2975 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	2976
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2977 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2978 PyEval_GetRestricted(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2979 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2980 PyFrameObject *current_frame = PyThreadState_Get()->frame;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2981 return current_frame == NULL ? 0 : current_frame->f_restricted;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2982 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	2983
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	2984 int
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2985 PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
17124 a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	2986 {
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	2987 PyFrameObject *current_frame = PyThreadState_Get()->frame;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2988 int result = 0;
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2989
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2990 if (current_frame != NULL) {
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2991 const int codeflags = current_frame->f_code->co_flags;
19350 5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	2992 const int compilerflags = codeflags & PyCF_MASK;
5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	2993 if (compilerflags) {
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2994 result = 1;
19350 5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	2995 cf->cf_flags \|= compilerflags;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2996 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	2997 #if 0 /* future keyword */
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	2998 if (codeflags & CO_GENERATOR_ALLOWED) {
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	2999 result = 1;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3000 cf->cf_flags \|= CO_GENERATOR_ALLOWED;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3001 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3002 #endif
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3003 }
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3004 return result;
17124 a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	3005 }
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	3006
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	3007 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3008 Py_FlushLine(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3009 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3010 PyObject *f = PySys_GetObject("stdout");
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	3011 if (f == NULL)
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	3012 return 0;
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	3013 if (!PyFile_SoftSpace(f, 0))
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	3014 return 0;
495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	3015 return PyFile_WriteString("\n", f);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3016 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3017
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3018
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3019 /* External interface to call any callable object.
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3020 The arg must be a tuple or NULL. */
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	3021
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3022 #undef PyEval_CallObject
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3023 /* for backward compatibility: export this interface */
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3024
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3025 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3026 PyEval_CallObject(PyObject func, PyObject arg)
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	3027 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3028 return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3029 }
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3030 #define PyEval_CallObject(func,arg) \
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3031 PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3032
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3033 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3034 PyEval_CallObjectWithKeywords(PyObject func, PyObject arg, PyObject *kw)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3035 {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3036 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3037
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3038 if (arg == NULL)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3039 arg = PyTuple_New(0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3040 else if (!PyTuple_Check(arg)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3041 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3042 "argument list must be a tuple");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3043 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3044 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3045 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3046 Py_INCREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3047
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3048 if (kw != NULL && !PyDict_Check(kw)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3049 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3050 "keyword list must be a dictionary");
12440 d47460b1a679 Charles Waldman writes: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	3051 Py_DECREF(arg);
2894 4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3052 return NULL;
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3053 }
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3054
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3055 result = PyObject_Call(func, arg, kw);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3056 Py_DECREF(arg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3057 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3058 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3059
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3060 char *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3061 PyEval_GetFuncName(PyObject *func)
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3062 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3063 if (PyMethod_Check(func))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3064 return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func));
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3065 else if (PyFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3066 return PyString_AsString(((PyFunctionObject*)func)->func_name);
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3067 else if (PyCFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3068 return ((PyCFunctionObject*)func)->m_ml->ml_name;
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3069 else if (PyClass_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3070 return PyString_AsString(((PyClassObject*)func)->cl_name);
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3071 else if (PyInstance_Check(func)) {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3072 return PyString_AsString(
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3073 ((PyInstanceObject*)func)->in_class->cl_name);
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3074 } else {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3075 return func->ob_type->tp_name;
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3076 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3077 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3078
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3079 char *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3080 PyEval_GetFuncDesc(PyObject *func)
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3081 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3082 if (PyMethod_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3083 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3084 else if (PyFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3085 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3086 else if (PyCFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3087 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3088 else if (PyClass_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3089 return " constructor";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3090 else if (PyInstance_Check(func)) {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3091 return " instance";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3092 } else {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3093 return " object";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3094 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3095 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3096
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3097 #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3098
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3099 /* The two fast_xxx() functions optimize calls for which no argument
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3100 tuple is necessary; the objects are passed directly from the stack.
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3101 fast_cfunction() is called for METH_OLDARGS functions.
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3102 fast_function() is for functions with no special argument handling.
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3103 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3104
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3105 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3106 fast_cfunction(PyObject func, PyObject **pp_stack, int na)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3107 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3108 PyCFunction meth = PyCFunction_GET_FUNCTION(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3109 PyObject *self = PyCFunction_GET_SELF(func);
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3110 int flags = PyCFunction_GET_FLAGS(func);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3111
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3112 switch (flags) {
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3113 case METH_OLDARGS:
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3114 if (na == 0)
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3115 return (*meth)(self, NULL);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3116 else if (na == 1) {
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3117 PyObject arg = EXT_POP(pp_stack);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3118 PyObject result = (meth)(self, arg);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3119 Py_DECREF(arg);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3120 return result;
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3121 } else {
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3122 PyObject *args = load_args(pp_stack, na);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3123 PyObject result = (meth)(self, args);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3124 Py_DECREF(args);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3125 return result;
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3126 }
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3127 case METH_NOARGS:
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3128 if (na == 0)
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3129 return (*meth)(self, NULL);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3130 PyErr_Format(PyExc_TypeError,
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3131 "%.200s() takes no arguments (%d given)",
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3132 ((PyCFunctionObject*)func)->m_ml->ml_name, na);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3133 return NULL;
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3134 case METH_O:
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3135 if (na == 1) {
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3136 PyObject arg = EXT_POP(pp_stack);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3137 PyObject result = (meth)(self, arg);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3138 Py_DECREF(arg);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3139 return result;
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3140 }
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3141 PyErr_Format(PyExc_TypeError,
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3142 "%.200s() takes exactly one argument (%d given)",
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3143 ((PyCFunctionObject*)func)->m_ml->ml_name, na);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3144 return NULL;
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3145 default:
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3146 fprintf(stderr, "%.200s() flags = %d\n",
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3147 ((PyCFunctionObject*)func)->m_ml->ml_name, flags);
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3148 PyErr_BadInternalCall();
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3149 return NULL;
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19198 diff changeset	3150 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3151 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3152
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3153 static PyObject *
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3154 fast_function(PyObject func, PyObject **pp_stack, int n, int na, int nk)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3155 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3156 PyObject *co = PyFunction_GET_CODE(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3157 PyObject *globals = PyFunction_GET_GLOBALS(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3158 PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	3159 PyObject *closure = PyFunction_GET_CLOSURE(func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3160 PyObject **d = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3161 int nd = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3162
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3163 if (argdefs != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3164 d = &PyTuple_GET_ITEM(argdefs, 0);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3165 nd = ((PyTupleObject *)argdefs)->ob_size;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3166 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3167 return PyEval_EvalCodeEx((PyCodeObject *)co, globals,
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3168 (PyObject )NULL, (pp_stack)-n, na,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	3169 (pp_stack)-2nk, nk, d, nd,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	3170 closure);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3171 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3172
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3173 static PyObject *
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3174 update_keyword_args(PyObject orig_kwdict, int nk, PyObject **pp_stack,
152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3175 PyObject *func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3176 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3177 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3178 if (orig_kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3179 kwdict = PyDict_New();
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3180 else {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3181 kwdict = PyDict_Copy(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3182 Py_DECREF(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3183 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3184 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3185 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3186 while (--nk >= 0) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3187 int err;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3188 PyObject value = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3189 PyObject key = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3190 if (PyDict_GetItem(kwdict, key) != NULL) {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3191 PyErr_Format(PyExc_TypeError,
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3192 "%.200s%s got multiple values "
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3193 "for keyword argument '%.200s'",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3194 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3195 PyEval_GetFuncDesc(func),
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3196 PyString_AsString(key));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3197 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3198 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3199 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3200 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3201 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3202 err = PyDict_SetItem(kwdict, key, value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3203 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3204 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3205 if (err) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3206 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3207 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3208 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3209 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3210 return kwdict;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3211 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3212
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3213 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3214 update_star_args(int nstack, int nstar, PyObject *stararg,
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3215 PyObject ***pp_stack)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3216 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3217 PyObject callargs, w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3218
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3219 callargs = PyTuple_New(nstack + nstar);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3220 if (callargs == NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3221 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3222 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3223 if (nstar) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3224 int i;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3225 for (i = 0; i < nstar; i++) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3226 PyObject *a = PyTuple_GET_ITEM(stararg, i);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3227 Py_INCREF(a);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3228 PyTuple_SET_ITEM(callargs, nstack + i, a);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3229 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3230 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3231 while (--nstack >= 0) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3232 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3233 PyTuple_SET_ITEM(callargs, nstack, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3234 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3235 return callargs;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3236 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3237
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3238 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3239 load_args(PyObject ***pp_stack, int na)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3240 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3241 PyObject *args = PyTuple_New(na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3242 PyObject *w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3243
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3244 if (args == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3245 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3246 while (--na >= 0) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3247 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3248 PyTuple_SET_ITEM(args, na, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3249 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3250 return args;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3251 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3252
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3253 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3254 do_call(PyObject func, PyObject **pp_stack, int na, int nk)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3255 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3256 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3257 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3258 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3259
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3260 if (nk > 0) {
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3261 kwdict = update_keyword_args(NULL, nk, pp_stack, func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3262 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3263 goto call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3264 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3265 callargs = load_args(pp_stack, na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3266 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3267 goto call_fail;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3268 result = PyObject_Call(func, callargs, kwdict);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3269 call_fail:
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3270 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3271 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3272 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3273 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3274
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3275 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3276 ext_do_call(PyObject func, PyObject **pp_stack, int flags, int na, int nk)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3277 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3278 int nstar = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3279 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3280 PyObject *stararg = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3281 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3282 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3283
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3284 if (flags & CALL_FLAG_KW) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3285 kwdict = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3286 if (!(kwdict && PyDict_Check(kwdict))) {
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3287 PyErr_Format(PyExc_TypeError,
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3288 "%s%s argument after ** "
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3289 "must be a dictionary",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3290 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3291 PyEval_GetFuncDesc(func));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3292 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3293 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3294 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3295 if (flags & CALL_FLAG_VAR) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3296 stararg = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3297 if (!PyTuple_Check(stararg)) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3298 PyObject *t = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3299 t = PySequence_Tuple(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3300 if (t == NULL) {
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3301 if (PyErr_ExceptionMatches(PyExc_TypeError)) {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3302 PyErr_Format(PyExc_TypeError,
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3303 "%s%s argument after * "
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3304 "must be a sequence",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3305 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3306 PyEval_GetFuncDesc(func));
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3307 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3308 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3309 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3310 Py_DECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3311 stararg = t;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3312 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3313 nstar = PyTuple_GET_SIZE(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3314 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3315 if (nk > 0) {
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3316 kwdict = update_keyword_args(kwdict, nk, pp_stack, func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3317 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3318 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3319 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3320 callargs = update_star_args(na, nstar, stararg, pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3321 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3322 goto ext_call_fail;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3323 result = PyObject_Call(func, callargs, kwdict);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3324 ext_call_fail:
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3325 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3326 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3327 Py_XDECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3328 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3329 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3330
3863 4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	3331 #define SLICE_ERROR_MSG \
4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	3332 "standard sequence type does not support step size other than one"
4566a19c3438 Better error message if stride used on normal sequence object Guido van Rossum <guido@python.org> parents: 3839 diff changeset	3333
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3334 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3335 loop_subscript(PyObject v, PyObject w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3336 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3337 PySequenceMethods *sq = v->ob_type->tp_as_sequence;
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3338 int i;
8403 c4df8b6637b6 Moved cmp_member() to abstract.c, as PySequence_Contains() [with Guido van Rossum <guido@python.org> parents: 8328 diff changeset	3339 if (sq == NULL \|\| sq->sq_item == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3340 PyErr_SetString(PyExc_TypeError, "loop over non-sequence");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3341 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3342 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3343 i = PyInt_AsLong(w);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3344 v = (*sq->sq_item)(v, i);
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3345 if (v)
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3346 return v;
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	3347 if (PyErr_ExceptionMatches(PyExc_IndexError))
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3348 PyErr_Clear();
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3349 return NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3350 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3351
21440 30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3352 /* Extract a slice index from a PyInt or PyLong, and store in *pi.
30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3353 Silently reduce values larger than INT_MAX to INT_MAX, and silently
30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3354 boost values less than -INT_MAX to 0. Return 0 on error, 1 on success.
30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3355 */
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3356 /* Note: If v is NULL, return success without storing into *pi. This
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3357 is because_PyEval_SliceIndex() is called by apply_slice(), which can be
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3358 called by the SLICE opcode with v and/or w equal to NULL.
21440 30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3359 */
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3360 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3361 _PyEval_SliceIndex(PyObject v, int pi)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3362 {
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3363 if (v != NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3364 long x;
11839 91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3365 if (PyInt_Check(v)) {
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3366 x = PyInt_AsLong(v);
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3367 } else if (PyLong_Check(v)) {
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3368 x = PyLong_AsLong(v);
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3369 if (x==-1 && PyErr_Occurred()) {
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3370 PyObject *long_zero;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3371 int cmp;
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3372
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3373 if (!PyErr_ExceptionMatches(
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3374 PyExc_OverflowError)) {
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3375 /* It's not an overflow error, so just
11839 91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3376 signal an error */
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3377 return 0;
11839 91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3378 }
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3379
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3380 /* Clear the OverflowError */
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3381 PyErr_Clear();
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3382
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3383 /* It's an overflow error, so we need to
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3384 check the sign of the long integer,
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3385 set the value to INT_MAX or 0, and clear
11839 91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3386 the error. */
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3387
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3388 /* Create a long integer with a value of 0 */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3389 long_zero = PyLong_FromLong(0L);
21440 30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3390 if (long_zero == NULL)
30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3391 return 0;
11839 91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3392
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3393 /* Check sign */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3394 cmp = PyObject_RichCompareBool(v, long_zero,
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3395 Py_GT);
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3396 Py_DECREF(long_zero);
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3397 if (cmp < 0)
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3398 return 0;
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3399 else if (cmp > 0)
11839 91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3400 x = INT_MAX;
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3401 else
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3402 x = 0;
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3403 }
91cfb6e68ca4 Allow using long integers as slice indexes Andrew M. Kuchling <amk@amk.ca> parents: 11827 diff changeset	3404 } else {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3405 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3406 "slice indices must be integers");
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3407 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3408 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3409 /* Truncate -- very long indices are truncated anyway */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3410 if (x > INT_MAX)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3411 x = INT_MAX;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3412 else if (x < -INT_MAX)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3413 x = 0;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3414 *pi = x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3415 }
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3416 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3417 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3418
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3419 #undef ISINT
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3420 #define ISINT(x) ((x) == NULL \|\| PyInt_Check(x) \|\| PyLong_Check(x))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3421
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3422 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3423 apply_slice(PyObject u, PyObject v, PyObject w) / return u[v:w] */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3424 {
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3425 PyTypeObject *tp = u->ob_type;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3426 PySequenceMethods *sq = tp->tp_as_sequence;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3427
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3428 if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3429 int ilow = 0, ihigh = INT_MAX;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3430 if (!_PyEval_SliceIndex(v, &ilow))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3431 return NULL;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3432 if (!_PyEval_SliceIndex(w, &ihigh))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3433 return NULL;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3434 return PySequence_GetSlice(u, ilow, ihigh);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3435 }
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3436 else {
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3437 PyObject *slice = PySlice_New(v, w, NULL);
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3438 if (slice != NULL) {
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3439 PyObject *res = PyObject_GetItem(u, slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3440 Py_DECREF(slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3441 return res;
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3442 }
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3443 else
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3444 return NULL;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3445 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3446 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3447
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3448 static int
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3449 assign_slice(PyObject u, PyObject v, PyObject w, PyObject x)
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3450 /* u[v:w] = x */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3451 {
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3452 PyTypeObject *tp = u->ob_type;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3453 PySequenceMethods *sq = tp->tp_as_sequence;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3454
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3455 if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3456 int ilow = 0, ihigh = INT_MAX;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3457 if (!_PyEval_SliceIndex(v, &ilow))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3458 return -1;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3459 if (!_PyEval_SliceIndex(w, &ihigh))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3460 return -1;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3461 if (x == NULL)
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3462 return PySequence_DelSlice(u, ilow, ihigh);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3463 else
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3464 return PySequence_SetSlice(u, ilow, ihigh, x);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3465 }
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3466 else {
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3467 PyObject *slice = PySlice_New(v, w, NULL);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3468 if (slice != NULL) {
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3469 int res;
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3470 if (x != NULL)
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3471 res = PyObject_SetItem(u, slice, x);
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3472 else
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3473 res = PyObject_DelItem(u, slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3474 Py_DECREF(slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3475 return res;
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3476 }
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3477 else
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3478 return -1;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3479 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3480 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3481
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3482 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3483 cmp_outcome(int op, register PyObject v, register PyObject w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3484 {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3485 int res = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3486 switch (op) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3487 case PyCmp_IS:
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3488 case PyCmp_IS_NOT:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3489 res = (v == w);
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3490 if (op == (int) PyCmp_IS_NOT)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3491 res = !res;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3492 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3493 case PyCmp_IN:
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3494 case PyCmp_NOT_IN:
8403 c4df8b6637b6 Moved cmp_member() to abstract.c, as PySequence_Contains() [with Guido van Rossum <guido@python.org> parents: 8328 diff changeset	3495 res = PySequence_Contains(w, v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3496 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3497 return NULL;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3498 if (op == (int) PyCmp_NOT_IN)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3499 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3500 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3501 case PyCmp_EXC_MATCH:
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	3502 res = PyErr_GivenExceptionMatches(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3503 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3504 default:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3505 return PyObject_RichCompare(v, w, op);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3506 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3507 v = res ? Py_True : Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3508 Py_INCREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3509 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3510 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3511
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3512 static PyObject *
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3513 import_from(PyObject v, PyObject name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3514 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3515 PyObject *x;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3516
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3517 x = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3518 if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3519 PyErr_Format(PyExc_ImportError,
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3520 "cannot import name %.230s",
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3521 PyString_AsString(name));
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3522 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3523 return x;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3524 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3525
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3526 static int
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3527 import_all_from(PyObject locals, PyObject v)
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3528 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3529 PyObject *all = PyObject_GetAttrString(v, "__all__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3530 PyObject dict, name, *value;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3531 int skip_leading_underscores = 0;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3532 int pos, err;
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3533
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3534 if (all == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3535 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3536 return -1; /* Unexpected error */
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3537 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3538 dict = PyObject_GetAttrString(v, "__dict__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3539 if (dict == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3540 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3541 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3542 PyErr_SetString(PyExc_ImportError,
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3543 "from-import-* object has no __dict__ and no __all__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3544 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3545 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3546 all = PyMapping_Keys(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3547 Py_DECREF(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3548 if (all == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3549 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3550 skip_leading_underscores = 1;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3551 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3552
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3553 for (pos = 0, err = 0; ; pos++) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3554 name = PySequence_GetItem(all, pos);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3555 if (name == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3556 if (!PyErr_ExceptionMatches(PyExc_IndexError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3557 err = -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3558 else
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3559 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3560 break;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3561 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3562 if (skip_leading_underscores &&
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3563 PyString_Check(name) &&
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3564 PyString_AS_STRING(name)[0] == '_')
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3565 {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3566 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3567 continue;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3568 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3569 value = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3570 if (value == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3571 err = -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3572 else
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3573 err = PyDict_SetItem(locals, name, value);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3574 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3575 Py_XDECREF(value);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3576 if (err != 0)
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3577 break;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3578 }
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3579 Py_DECREF(all);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3580 return err;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3581 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3582
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3583 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3584 build_class(PyObject methods, PyObject bases, PyObject *name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3585 {
19890 31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3586 PyObject metaclass = NULL, result, *base;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3587
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3588 if (PyDict_Check(methods))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3589 metaclass = PyDict_GetItemString(methods, "__metaclass__");
19890 31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3590 if (metaclass != NULL)
21252 e386f6e26a42 Fix a typo (probably caused by autocompletion <blush>) that caused a Guido van Rossum <guido@python.org> parents: 21251 diff changeset	3591 Py_INCREF(metaclass);
19890 31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3592 else if (PyTuple_Check(bases) && PyTuple_GET_SIZE(bases) > 0) {
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3593 base = PyTuple_GET_ITEM(bases, 0);
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3594 metaclass = PyObject_GetAttrString(base, "__class__");
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3595 if (metaclass == NULL) {
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3596 PyErr_Clear();
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3597 metaclass = (PyObject *)base->ob_type;
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3598 Py_INCREF(metaclass);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	3599 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	3600 }
19890 31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3601 else {
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3602 PyObject *g = PyEval_GetGlobals();
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3603 if (g != NULL && PyDict_Check(g))
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3604 metaclass = PyDict_GetItemString(g, "__metaclass__");
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3605 if (metaclass == NULL)
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3606 metaclass = (PyObject *) &PyClass_Type;
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3607 Py_INCREF(metaclass);
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3608 }
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3609 result = PyObject_CallFunction(metaclass, "OOO", name, bases, methods);
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3610 Py_DECREF(metaclass);
31fe8b3e276b build_class(): one more (hopefully the last) step on the way to Guido van Rossum <guido@python.org> parents: 19692 diff changeset	3611 return result;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	3612 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	3613
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3614 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3615 exec_statement(PyFrameObject f, PyObject prog, PyObject *globals,
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3616 PyObject *locals)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3617 {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3618 int n;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3619 PyObject *v;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3620 int plain = 0;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3621
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3622 if (PyTuple_Check(prog) && globals == Py_None && locals == Py_None &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3623 ((n = PyTuple_Size(prog)) == 2 \|\| n == 3)) {
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3624 /* Backward compatibility hack */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3625 globals = PyTuple_GetItem(prog, 1);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3626 if (n == 3)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3627 locals = PyTuple_GetItem(prog, 2);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3628 prog = PyTuple_GetItem(prog, 0);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3629 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3630 if (globals == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3631 globals = PyEval_GetGlobals();
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3632 if (locals == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3633 locals = PyEval_GetLocals();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3634 plain = 1;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3635 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3636 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3637 else if (locals == Py_None)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3638 locals = globals;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3639 if (!PyString_Check(prog) &&
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	3640 !PyUnicode_Check(prog) &&
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3641 !PyCode_Check(prog) &&
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3642 !PyFile_Check(prog)) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3643 PyErr_SetString(PyExc_TypeError,
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3644 "exec: arg 1 must be a string, file, or code object");
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3645 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3646 }
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3647 if (!PyDict_Check(globals)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3648 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3649 "exec: arg 2 must be a dictionary or None");
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3650 return -1;
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3651 }
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3652 if (!PyDict_Check(locals)) {
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3653 PyErr_SetString(PyExc_TypeError,
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3654 "exec: arg 3 must be a dictionary or None");
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3655 return -1;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3656 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3657 if (PyDict_GetItemString(globals, "__builtins__") == NULL)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3658 PyDict_SetItemString(globals, "__builtins__", f->f_builtins);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3659 if (PyCode_Check(prog)) {
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21270 diff changeset	3660 if (PyCode_GetNumFree((PyCodeObject *)prog) > 0) {
de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21270 diff changeset	3661 PyErr_SetString(PyExc_TypeError,
de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21270 diff changeset	3662 "code object passed to exec may not contain free variables");
de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21270 diff changeset	3663 return -1;
de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21270 diff changeset	3664 }
11651 d88996e46cb2 Fix a bug in exec_statement() noted incidentally by Tim Peters in Guido van Rossum <guido@python.org> parents: 11468 diff changeset	3665 v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3666 }
11651 d88996e46cb2 Fix a bug in exec_statement() noted incidentally by Tim Peters in Guido van Rossum <guido@python.org> parents: 11468 diff changeset	3667 else if (PyFile_Check(prog)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3668 FILE *fp = PyFile_AsFile(prog);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3669 char *name = PyString_AsString(PyFile_Name(prog));
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3670 PyCompilerFlags cf;
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3671 cf.cf_flags = 0;
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3672 if (PyEval_MergeCompilerFlags(&cf))
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3673 v = PyRun_FileFlags(fp, name, Py_file_input, globals,
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3674 locals, &cf);
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3675 else
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3676 v = PyRun_File(fp, name, Py_file_input, globals,
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3677 locals);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3678 }
11651 d88996e46cb2 Fix a bug in exec_statement() noted incidentally by Tim Peters in Guido van Rossum <guido@python.org> parents: 11468 diff changeset	3679 else {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	3680 char *str;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3681 PyCompilerFlags cf;
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	3682 if (PyString_AsStringAndSize(prog, &str, NULL))
11651 d88996e46cb2 Fix a bug in exec_statement() noted incidentally by Tim Peters in Guido van Rossum <guido@python.org> parents: 11468 diff changeset	3683 return -1;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3684 cf.cf_flags = 0;
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3685 if (PyEval_MergeCompilerFlags(&cf))
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3686 v = PyRun_StringFlags(str, Py_file_input, globals,
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3687 locals, &cf);
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3688 else
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	3689 v = PyRun_String(str, Py_file_input, globals, locals);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3690 }
11651 d88996e46cb2 Fix a bug in exec_statement() noted incidentally by Tim Peters in Guido van Rossum <guido@python.org> parents: 11468 diff changeset	3691 if (plain)
d88996e46cb2 Fix a bug in exec_statement() noted incidentally by Tim Peters in Guido van Rossum <guido@python.org> parents: 11468 diff changeset	3692 PyFrame_LocalsToFast(f, 0);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3693 if (v == NULL)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3694 return -1;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3695 Py_DECREF(v);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3696 return 0;
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3697 }
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	3698
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3699 static void
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3700 format_exc_check_arg(PyObject exc, char format_str, PyObject *obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3701 {
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3702 char *obj_str;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3703
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3704 if (!obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3705 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3706
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3707 obj_str = PyString_AsString(obj);
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3708 if (!obj_str)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3709 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3710
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3711 PyErr_Format(exc, format_str, obj_str);
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3712 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3713
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3714 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3715
20438 08d7a6756bfe make getarray static - it's only called from ceval.c and is not an Skip Montanaro <skip@pobox.com> parents: 20409 diff changeset	3716 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3717 getarray(long a[256])
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3718 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3719 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3720 PyObject *l = PyList_New(256);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3721 if (l == NULL) return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3722 for (i = 0; i < 256; i++) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3723 PyObject *x = PyInt_FromLong(a[i]);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3724 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3725 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3726 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3727 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3728 PyList_SetItem(l, i, x);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3729 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3730 for (i = 0; i < 256; i++)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3731 a[i] = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3732 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3733 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3734
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3735 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3736 _Py_GetDXProfile(PyObject self, PyObject args)
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3737 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3738 #ifndef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3739 return getarray(dxp);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3740 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3741 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3742 PyObject *l = PyList_New(257);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3743 if (l == NULL) return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3744 for (i = 0; i < 257; i++) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3745 PyObject *x = getarray(dxpairs[i]);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3746 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3747 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3748 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3749 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3750 PyList_SetItem(l, i, x);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3751 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3752 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3753 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3754 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3755
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3756 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 22621:830c829a7eb2 legacy-trunk