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

annotate Python/ceval.c @ 68249:4cd9f5e89061 3.0

Close 3.0 branch.

author	Georg Brandl <georg@python.org>
date	Sat, 05 Mar 2011 15:09:43 +0100
parents	33a1e1008e54
children

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
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	9 /* enable more aggressive intra-module optimizations, where available */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	10 #define PY_LOCAL_AGGRESSIVE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	11
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	12 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	13
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	14 #include "code.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	15 #include "frameobject.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	16 #include "eval.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 #include "opcode.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	18 #include "structmember.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	20 #include <ctype.h>
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	21
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	22 #ifndef WITH_TSC
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	23
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	24 #define READ_TIMESTAMP(var)
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	25
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	26 #else
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	27
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	28 typedef unsigned long long uint64;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	29
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	30 #if defined(__ppc__) /* <- Don't know if this is the correct symbol; this
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	31 section should work for GCC on any PowerPC
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	32 platform, irrespective of OS.
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	33 POWER? Who knows :-) */
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	34
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	35 #define READ_TIMESTAMP(var) ppc_getcounter(&var)
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	36
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	37 static void
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	38 ppc_getcounter(uint64 *v)
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	39 {
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	40 register unsigned long tbu, tb, tbu2;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	41
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	42 loop:
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	43 asm volatile ("mftbu %0" : "=r" (tbu) );
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	44 asm volatile ("mftb %0" : "=r" (tb) );
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	45 asm volatile ("mftbu %0" : "=r" (tbu2));
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	46 if (__builtin_expect(tbu != tbu2, 0)) goto loop;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	47
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	48 /* The slightly peculiar way of writing the next lines is
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	49 compiled better by GCC than any other way I tried. */
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	50 ((long*)(v))[0] = tbu;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	51 ((long*)(v))[1] = tb;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	52 }
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	53
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	54 #else /* this is for linux/x86 (and probably any other GCC/x86 combo) */
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	55
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	56 #define READ_TIMESTAMP(val) \
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	57 __asm__ __volatile__("rdtsc" : "=A" (val))
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	58
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	59 #endif
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	60
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	61 void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	62 uint64 loop0, uint64 loop1, uint64 intr0, uint64 intr1)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	63 {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	64 uint64 intr, inst, loop;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	65 PyThreadState *tstate = PyThreadState_Get();
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	66 if (!tstate->interp->tscdump)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	67 return;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	68 intr = intr1 - intr0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	69 inst = inst1 - inst0 - intr;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	70 loop = loop1 - loop0 - intr;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	71 fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n",
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	72 opcode, ticked, inst, loop);
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	73 }
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	74
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	75 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	76
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	77 /* 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	78 /* #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	79
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	80 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	81 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	82 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	83 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	84 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	85
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	86 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	87
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	88 /* Forward declarations */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	89 #ifdef WITH_TSC
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	90 static PyObject * call_function(PyObject **, int, uint64, uint64*);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	91 #else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	92 static PyObject * call_function(PyObject ***, int);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	93 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	94 static PyObject * fast_function(PyObject , PyObject **, int, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	95 static PyObject * do_call(PyObject , PyObject **, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	96 static PyObject * ext_do_call(PyObject , PyObject **, int, int, int);
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	97 static PyObject * update_keyword_args(PyObject , int, PyObject **,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	98 PyObject *);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	99 static PyObject * update_star_args(int, int, PyObject , PyObject **);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	100 static PyObject * load_args(PyObject ***, int);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	101 #define CALL_FLAG_VAR 1
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	102 #define CALL_FLAG_KW 2
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	103
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	104 #ifdef LLTRACE
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	105 static int lltrace;
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	106 static int prtrace(PyObject , char );
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	107 #endif
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	108 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	109 int, PyObject *);
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	110 static int call_trace_protected(Py_tracefunc, PyObject *,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	111 PyFrameObject , int, PyObject );
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	112 static void call_exc_trace(Py_tracefunc, PyObject , PyFrameObject );
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	113 static int maybe_call_line_trace(Py_tracefunc, PyObject *,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	114 PyFrameObject , int , int , int );
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	115
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	116 static PyObject * cmp_outcome(int, PyObject , PyObject );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	117 static PyObject * import_from(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	118 static int import_all_from(PyObject , PyObject );
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	119 static void format_exc_check_arg(PyObject , const char , PyObject *);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	120 static PyObject * unicode_concatenate(PyObject , PyObject ,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	121 PyFrameObject , unsigned char );
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	122
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	123 #define NAME_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	124 "name '%.200s' is not defined"
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	125 #define GLOBAL_NAME_ERROR_MSG \
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	126 "global name '%.200s' is not defined"
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	127 #define UNBOUNDLOCAL_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	128 "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	129 #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	130 "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	131 " in enclosing scope"
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	132
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	133 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	134 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	135 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	136 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	137 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	138 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	139 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	140 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	141 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	142
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	143 /* Function call profile */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	144 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	145 #define PCALL_NUM 11
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	146 static int pcall[PCALL_NUM];
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	147
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	148 #define PCALL_ALL 0
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	149 #define PCALL_FUNCTION 1
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	150 #define PCALL_FAST_FUNCTION 2
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	151 #define PCALL_FASTER_FUNCTION 3
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	152 #define PCALL_METHOD 4
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	153 #define PCALL_BOUND_METHOD 5
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	154 #define PCALL_CFUNCTION 6
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	155 #define PCALL_TYPE 7
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	156 #define PCALL_GENERATOR 8
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	157 #define PCALL_OTHER 9
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	158 #define PCALL_POP 10
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	159
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	160 /* Notes about the statistics
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	161
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	162 PCALL_FAST stats
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	163
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	164 FAST_FUNCTION means no argument tuple needs to be created.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	165 FASTER_FUNCTION means that the fast-path frame setup code is used.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	166
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	167 If there is a method call where the call can be optimized by changing
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	168 the argument tuple and calling the function directly, it gets recorded
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	169 twice.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	170
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	171 As a result, the relationship among the statistics appears to be
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	172 PCALL_ALL == PCALL_FUNCTION + PCALL_METHOD - PCALL_BOUND_METHOD +
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	173 PCALL_CFUNCTION + PCALL_TYPE + PCALL_GENERATOR + PCALL_OTHER
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	174 PCALL_FUNCTION > PCALL_FAST_FUNCTION > PCALL_FASTER_FUNCTION
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	175 PCALL_METHOD > PCALL_BOUND_METHOD
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	176 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	177
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	178 #define PCALL(POS) pcall[POS]++
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	179
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	180 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	181 PyEval_GetCallStats(PyObject *self)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	182 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	183 return Py_BuildValue("iiiiiiiiiii",
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	184 pcall[0], pcall[1], pcall[2], pcall[3],
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	185 pcall[4], pcall[5], pcall[6], pcall[7],
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	186 pcall[8], pcall[9], pcall[10]);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	187 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	188 #else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	189 #define PCALL(O)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	190
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	191 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	192 PyEval_GetCallStats(PyObject *self)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	193 {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	194 Py_INCREF(Py_None);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	195 return Py_None;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	196 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	197 #endif
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	198
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	199
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	200 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	201
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	202 #ifdef HAVE_ERRNO_H
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	203 #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	204 #endif
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9048 diff changeset	205 #include "pythread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	206
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	207 static PyThread_type_lock interpreter_lock = 0; /* This is the GIL */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	208 static long main_thread = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	209
33715 a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	210 int
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	211 PyEval_ThreadsInitialized(void)
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	212 {
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	213 return interpreter_lock != 0;
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	214 }
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	215
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	216 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	217 PyEval_InitThreads(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	218 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	219 if (interpreter_lock)
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	220 return;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	221 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	222 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	223 main_thread = PyThread_get_thread_ident();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	224 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	225
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	226 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	227 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	228 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	229 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	230 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	231
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	232 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	233 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	234 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	235 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	236 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	237
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	238 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	239 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	240 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	241 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	242 Py_FatalError("PyEval_AcquireThread: NULL new thread state");
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28556 diff changeset	243 /* Check someone has called PyEval_InitThreads() to create the lock */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28556 diff changeset	244 assert(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	245 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	246 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	247 Py_FatalError(
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	248 "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	249 }
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	250
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	251 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	252 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	253 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	254 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	255 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	256 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	257 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	258 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	259 }
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	260
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	261 /* 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	262 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	263 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	264 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	265
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	266 void
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	267 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	268 {
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	269 PyObject threading, result;
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	270 PyThreadState *tstate;
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	271
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	272 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	273 return;
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	274 /*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	275 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	276 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	277 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	278 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	279 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	280 main_thread = PyThread_get_thread_ident();
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	281
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	282 /* Update the threading module with the new state.
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	283 */
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	284 tstate = PyThreadState_GET();
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	285 threading = PyMapping_GetItemString(tstate->interp->modules,
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	286 "threading");
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	287 if (threading == NULL) {
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	288 /* threading not imported */
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	289 PyErr_Clear();
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	290 return;
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	291 }
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	292 result = PyObject_CallMethod(threading, "_after_fork", NULL);
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	293 if (result == NULL)
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	294 PyErr_WriteUnraisable(threading);
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	295 else
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	296 Py_DECREF(result);
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	297 Py_DECREF(threading);
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	298 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	299 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	300
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	301 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	302 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	303 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	304
5846 852a1fa62a7c PyEval_SaveThread() and PyEval_RestoreThread() now return/take a Guido van Rossum <guido@python.org> parents: 5829 diff changeset	305 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	306 PyEval_SaveThread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	307 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	308 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	309 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	310 Py_FatalError("PyEval_SaveThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	311 #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	312 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	313 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	314 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	315 return tstate;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	316 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	317
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	318 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	319 PyEval_RestoreThread(PyThreadState *tstate)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	320 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	321 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	322 Py_FatalError("PyEval_RestoreThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	323 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	324 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	325 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	326 PyThread_acquire_lock(interpreter_lock, 1);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	327 errno = err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	328 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	329 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	330 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	331 }
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
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	334 /* 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	335 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	336 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	337 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	338 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	339 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	340
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	341 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	342 (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	343 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	344
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	345 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	346 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	347
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	348 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	349 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	350 will execute them.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	351 #endif
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	352
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	353 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	354 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	355 (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	356 (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	357 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	358 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	359 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	360 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	361
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	362 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	363 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	364 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	365
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	366 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	367 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	368 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	369 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	370 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	371 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	372 static volatile int pendinglast = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	373 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	374
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	375 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	376 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	377 {
32526 78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 32463 diff changeset	378 static volatile 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	379 int i, j;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	380 /* 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	381 /* 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	382 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	383 if (busy)
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	384 return -1;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	385 busy = 1;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	386 i = pendinglast;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	387 j = (i + 1) % NPENDINGCALLS;
24284 d8909792005a SF patch 552161 - Py_AddPendingCall doesn't unlock on fail (Daniel Guido van Rossum <guido@python.org> parents: 24283 diff changeset	388 if (j == pendingfirst) {
d8909792005a SF patch 552161 - Py_AddPendingCall doesn't unlock on fail (Daniel Guido van Rossum <guido@python.org> parents: 24283 diff changeset	389 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	390 return -1; /* Queue full */
24284 d8909792005a SF patch 552161 - Py_AddPendingCall doesn't unlock on fail (Daniel Guido van Rossum <guido@python.org> parents: 24283 diff changeset	391 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	392 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	393 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	394 pendinglast = j;
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	395
3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	396 _Py_Ticker = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	397 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	398 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	399 /* 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	400 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	401 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	402
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	403 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	404 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	405 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	406 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	407 #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	408 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	409 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	410 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	411 if (busy)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	412 return 0;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	413 busy = 1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	414 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	415 for (;;) {
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	416 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	417 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	418 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	419 i = pendingfirst;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	420 if (i == pendinglast)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	421 break; /* Queue empty */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	422 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	423 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	424 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	425 if (func(arg) < 0) {
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	426 busy = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	427 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	428 return -1;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	429 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	430 }
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	431 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	432 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	433 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	434
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	435
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	436 /* The interpreter's recursion limit */
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	437
34863 71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	438 #ifndef Py_DEFAULT_RECURSION_LIMIT
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	439 #define Py_DEFAULT_RECURSION_LIMIT 1000
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	440 #endif
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	441 static int recursion_limit = Py_DEFAULT_RECURSION_LIMIT;
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	442 int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	443
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	444 int
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	445 Py_GetRecursionLimit(void)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	446 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	447 return recursion_limit;
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	448 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	449
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	450 void
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	451 Py_SetRecursionLimit(int new_limit)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	452 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	453 recursion_limit = new_limit;
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	454 _Py_CheckRecursionLimit = recursion_limit;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	455 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	456
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	457 /* the macro Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall()
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	458 if the recursion_depth reaches _Py_CheckRecursionLimit.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	459 If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	460 to guarantee that _Py_CheckRecursiveCall() is regularly called.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	461 Without USE_STACKCHECK, there is no need for this. */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	462 int
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	463 _Py_CheckRecursiveCall(char *where)
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	464 {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	465 PyThreadState *tstate = PyThreadState_GET();
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	466
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	467 #ifdef USE_STACKCHECK
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	468 if (PyOS_CheckStack()) {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	469 --tstate->recursion_depth;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	470 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	471 return -1;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	472 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	473 #endif
48986 22ab106e3186 Issue #3697: "Fatal Python error: Cannot recover from stack overflow" Antoine Pitrou <solipsis@pitrou.net> parents: 48887 diff changeset	474 _Py_CheckRecursionLimit = recursion_limit;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	475 if (tstate->recursion_critical)
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	476 /* Somebody asked that we don't check for recursion. */
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	477 return 0;
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	478 if (tstate->overflowed) {
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	479 if (tstate->recursion_depth > recursion_limit + 50) {
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	480 /* Overflowing while handling an overflow. Give up. */
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	481 Py_FatalError("Cannot recover from stack overflow.");
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	482 }
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	483 return 0;
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	484 }
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	485 if (tstate->recursion_depth > recursion_limit) {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	486 --tstate->recursion_depth;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	487 tstate->overflowed = 1;
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	488 PyErr_Format(PyExc_RuntimeError,
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	489 "maximum recursion depth exceeded%s",
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	490 where);
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	491 return -1;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	492 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	493 return 0;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	494 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	495
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	496 /* Status code for main loop (reason for stack unwind) */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	497 enum why_code {
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	498 WHY_NOT = 0x0001, /* No error */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	499 WHY_EXCEPTION = 0x0002, /* Exception occurred */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	500 WHY_RERAISE = 0x0004, /* Exception re-raised by 'finally' */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	501 WHY_RETURN = 0x0008, /* 'return' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	502 WHY_BREAK = 0x0010, /* 'break' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	503 WHY_CONTINUE = 0x0020, /* 'continue' statement */
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	504 WHY_YIELD = 0x0040, /* 'yield' operator */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	505 WHY_SILENCED = 0x0080 /* Exception silenced by 'with' */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	506 };
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	507
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	508 static enum why_code do_raise(PyObject , PyObject );
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	509 static int unpack_iterable(PyObject , int, int, PyObject *);
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	510
50133 33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	511 /* Records whether tracing is on for any thread. Counts the number of
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	512 threads for which tstate->c_tracefunc is non-NULL, so if the value
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	513 is 0, we know we don't have to check this thread's c_tracefunc.
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	514 This speeds up the if statement in PyEval_EvalFrameEx() after
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	515 fast_next_opcode*/
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	516 static int _Py_TracingPossible = 0;
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	517
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	518 /* for manipulating the thread switch and periodic "stuff" - used to be
3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	519 per thread, now just a pair o' globals */
25109 00b6dd414b80 Bump default check interval to 100 instructions. Computers are much faster Skip Montanaro <skip@pobox.com> parents: 25108 diff changeset	520 int _Py_CheckInterval = 100;
00b6dd414b80 Bump default check interval to 100 instructions. Computers are much faster Skip Montanaro <skip@pobox.com> parents: 25108 diff changeset	521 volatile int _Py_Ticker = 100;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	522
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	523 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	524 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	525 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	526 return PyEval_EvalCodeEx(co,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	527 globals, locals,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	528 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	529 (PyObject **)NULL, 0,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	530 (PyObject **)NULL, 0,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	531 NULL, NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	532 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	533
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	534
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	535 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	536
32421 485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure. Martin v. Löwis <martin@v.loewis.de> parents: 32412 diff changeset	537 PyObject *
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	538 PyEval_EvalFrame(PyFrameObject *f) {
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	539 /* This is for backward compatibility with extension modules that
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	540 used this API; core interpreter code should call
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	541 PyEval_EvalFrameEx() */
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	542 return PyEval_EvalFrameEx(f, 0);
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	543 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	544
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	545 PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	546 PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	547 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	548 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	549 int lastopcode = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	550 #endif
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	551 register 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	552 register unsigned char *next_instr;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	553 register int opcode; /* Current opcode */
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	554 register int oparg; /* Current opcode argument, if any */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	555 register enum why_code why; /* Reason for block stack unwind */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	556 register int err; /* Error status -- nonzero if error */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	557 register PyObject x; / Result object -- NULL if error */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	558 register PyObject v; / Temporary objects popped off stack */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	559 register PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	560 register PyObject *u;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	561 register PyObject *t;
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	562 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	563 PyObject retval = NULL; / Return value */
9671 1d40bc25703a Use PyThreadState_GET() macro. Guido van Rossum <guido@python.org> parents: 9591 diff changeset	564 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	565 PyCodeObject *co;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	566
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	567 /* when tracing we set things up so that
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	568
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	569 not (instr_lb <= current_bytecode_offset < instr_ub)
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	570
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	571 is true when the line being executed has changed. The
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	572 initial values are such as to make this false the first
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	573 time it is tested. */
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	574 int instr_ub = -1, instr_lb = 0, instr_prev = -1;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	575
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	576 unsigned char *first_instr;
24545 d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	577 PyObject *names;
d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	578 PyObject *consts;
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	579 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	580 /* 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	581 char *filename;
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	582 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	583
24232 e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	584 /* Tuple access macros */
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	585
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	586 #ifndef Py_DEBUG
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	587 #define GETITEM(v, i) PyTuple_GET_ITEM((PyTupleObject *)(v), (i))
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	588 #else
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	589 #define GETITEM(v, i) PyTuple_GetItem((v), (i))
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	590 #endif
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	591
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	592 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	593 /* Use Pentium timestamp counter to mark certain events:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	594 inst0 -- beginning of switch statement for opcode dispatch
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	595 inst1 -- end of switch statement (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	596 loop0 -- the top of the mainloop
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	597 loop1 -- place where control returns again to top of mainloop
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	598 (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	599 intr1 -- beginning of long interruption
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	600 intr2 -- end of long interruption
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	601
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	602 Many opcodes call out to helper C functions. In some cases, the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	603 time in those functions should be counted towards the time for the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	604 opcode, but not in all cases. For example, a CALL_FUNCTION opcode
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	605 calls another Python function; there's no point in charge all the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	606 bytecode executed by the called function to the caller.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	607
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	608 It's hard to make a useful judgement statically. In the presence
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	609 of operator overloading, it's impossible to tell if a call will
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	610 execute new Python code or not.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	611
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	612 It's a case-by-case judgement. I'll use intr1 for the following
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	613 cases:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	614
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	615 IMPORT_STAR
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	616 IMPORT_FROM
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	617 CALL_FUNCTION (and friends)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	618
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	619 */
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	620 uint64 inst0, inst1, loop0, loop1, intr0 = 0, intr1 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	621 int ticked = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	622
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	623 READ_TIMESTAMP(inst0);
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	624 READ_TIMESTAMP(inst1);
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	625 READ_TIMESTAMP(loop0);
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	626 READ_TIMESTAMP(loop1);
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	627
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	628 /* shut up the compiler */
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	629 opcode = 0;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	630 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	631
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	632 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	633
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	634 #define INSTR_OFFSET() ((int)(next_instr - first_instr))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	635 #define NEXTOP() (*next_instr++)
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	636 #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	637 #define PEEKARG() ((next_instr[2]<<8) + next_instr[1])
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	638 #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	639 #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	640
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	641 /* OpCode prediction macros
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	642 Some opcodes tend to come in pairs thus making it possible to
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	643 predict the second code when the first is run. For example,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	644 COMPARE_OP is often followed by JUMP_IF_FALSE or JUMP_IF_TRUE. And,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	645 those opcodes are often followed by a POP_TOP.
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	646
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	647 Verifying the prediction costs a single high-speed test of a register
28303 470504ef578b Fix comment and whitespace. Raymond Hettinger <python@rcn.com> parents: 28302 diff changeset	648 variable against a constant. If the pairing was good, then the
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	649 processor's own internal branch predication has a high likelihood of
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	650 success, resulting in a nearly zero-overhead transition to the
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	651 next opcode. A successful prediction saves a trip through the eval-loop
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	652 including its two unpredictable branches, the HAS_ARG test and the
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	653 switch-case. Combined with the processor's internal branch prediction,
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	654 a successful PREDICT has the effect of making the two opcodes run as if
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	655 they were a single new opcode with the bodies combined.
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	656
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	657 If collecting opcode statistics, your choices are to either keep the
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	658 predictions turned-on and interpret the results as if some opcodes
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	659 had been combined or turn-off predictions so that the opcode frequency
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	660 counter updates for both opcodes.
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	661 */
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	662
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	663 #ifdef DYNAMIC_EXECUTION_PROFILE
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	664 #define PREDICT(op) if (0) goto PRED_##op
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	665 #else
28303 470504ef578b Fix comment and whitespace. Raymond Hettinger <python@rcn.com> parents: 28302 diff changeset	666 #define PREDICT(op) if (*next_instr == op) goto PRED_##op
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	667 #endif
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	668
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	669 #define PREDICTED(op) PRED_##op: next_instr++
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	670 #define PREDICTED_WITH_ARG(op) PRED_##op: oparg = PEEKARG(); next_instr += 3
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	671
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	672 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	673
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	674 /* The stack can grow at most MAXINT deep, as co_nlocals and
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	675 co_stacksize are ints. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	676 #define STACK_LEVEL() ((int)(stack_pointer - f->f_valuestack))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	677 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	678 #define TOP() (stack_pointer[-1])
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	679 #define SECOND() (stack_pointer[-2])
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	680 #define THIRD() (stack_pointer[-3])
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	681 #define FOURTH() (stack_pointer[-4])
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	682 #define SET_TOP(v) (stack_pointer[-1] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	683 #define SET_SECOND(v) (stack_pointer[-2] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	684 #define SET_THIRD(v) (stack_pointer[-3] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	685 #define SET_FOURTH(v) (stack_pointer[-4] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	686 #define BASIC_STACKADJ(n) (stack_pointer += n)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	687 #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	688 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	689
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	690 #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	691 #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	692 lltrace && prtrace(TOP(), "push")); \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	693 assert(STACK_LEVEL() <= co->co_stacksize); }
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	694 #define POP() ((void)(lltrace && prtrace(TOP(), "pop")), \
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	695 BASIC_POP())
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	696 #define STACKADJ(n) { (void)(BASIC_STACKADJ(n), \
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	697 lltrace && prtrace(TOP(), "stackadj")); \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	698 assert(STACK_LEVEL() <= co->co_stacksize); }
44310 e70acbf26cda Merged revisions 59488-59511 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44187 diff changeset	699 #define EXT_POP(STACK_POINTER) ((void)(lltrace && \
e70acbf26cda Merged revisions 59488-59511 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44187 diff changeset	700 prtrace((STACK_POINTER)[-1], "ext_pop")), \
e70acbf26cda Merged revisions 59488-59511 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44187 diff changeset	701 *--(STACK_POINTER))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	702 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	703 #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	704 #define POP() BASIC_POP()
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	705 #define STACKADJ(n) BASIC_STACKADJ(n)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	706 #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	707 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	708
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	709 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	710
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	711 #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	712
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	713 /* 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	714 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	715 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	716 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	717 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	718 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	719 #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	720 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	721 Py_XDECREF(tmp); } while (0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	722
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	723
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	724 #define UNWIND_BLOCK(b) \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	725 while (STACK_LEVEL() > (b)->b_level) { \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	726 PyObject *v = POP(); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	727 Py_XDECREF(v); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	728 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	729
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	730 #define UNWIND_EXCEPT_HANDLER(b) \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	731 { \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	732 PyObject type, value, *traceback; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	733 assert(STACK_LEVEL() >= (b)->b_level + 3); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	734 while (STACK_LEVEL() > (b)->b_level + 3) { \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	735 value = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	736 Py_XDECREF(value); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	737 } \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	738 type = tstate->exc_type; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	739 value = tstate->exc_value; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	740 traceback = tstate->exc_traceback; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	741 tstate->exc_type = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	742 tstate->exc_value = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	743 tstate->exc_traceback = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	744 Py_XDECREF(type); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	745 Py_XDECREF(value); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	746 Py_XDECREF(traceback); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	747 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	748
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	749 #define SAVE_EXC_STATE() \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	750 { \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	751 PyObject type, value, *traceback; \
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	752 Py_XINCREF(tstate->exc_type); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	753 Py_XINCREF(tstate->exc_value); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	754 Py_XINCREF(tstate->exc_traceback); \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	755 type = f->f_exc_type; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	756 value = f->f_exc_value; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	757 traceback = f->f_exc_traceback; \
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	758 f->f_exc_type = tstate->exc_type; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	759 f->f_exc_value = tstate->exc_value; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	760 f->f_exc_traceback = tstate->exc_traceback; \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	761 Py_XDECREF(type); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	762 Py_XDECREF(value); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	763 Py_XDECREF(traceback); \
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	764 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	765
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	766 #define SWAP_EXC_STATE() \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	767 { \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	768 PyObject *tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	769 tmp = tstate->exc_type; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	770 tstate->exc_type = f->f_exc_type; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	771 f->f_exc_type = tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	772 tmp = tstate->exc_value; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	773 tstate->exc_value = f->f_exc_value; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	774 f->f_exc_value = tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	775 tmp = tstate->exc_traceback; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	776 tstate->exc_traceback = f->f_exc_traceback; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	777 f->f_exc_traceback = tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	778 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	779
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	780 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	781
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	782 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	783 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	784
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	785 /* push frame */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	786 if (Py_EnterRecursiveCall(""))
30782 f51dc9026e4d oh dear. Wrong manipulation. Committed a version of ceval.c from my Armin Rigo <arigo@tunes.org> parents: 30781 diff changeset	787 return NULL;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	788
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	789 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	790
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	791 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	792 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	793 /* 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	794 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	795 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	796 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	797 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	798 (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	799 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	800 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	801 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	802 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	803 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	804 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	805 whenever an exception is detected. */
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	806 if (call_trace_protected(tstate->c_tracefunc,
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	807 tstate->c_traceobj,
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	808 f, PyTrace_CALL, Py_None)) {
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	809 /* Trace function raised an error */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	810 goto exit_eval_frame;
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	811 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	812 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	813 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	814 /* 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	815 return itself and isn't called for "line" events */
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	816 if (call_trace_protected(tstate->c_profilefunc,
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	817 tstate->c_profileobj,
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	818 f, PyTrace_CALL, Py_None)) {
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	819 /* Profile function raised an error */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	820 goto exit_eval_frame;
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	821 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	822 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	823 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	824
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	825 co = f->f_code;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	826 names = co->co_names;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	827 consts = co->co_consts;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	828 fastlocals = f->f_localsplus;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	829 freevars = f->f_localsplus + co->co_nlocals;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46725 diff changeset	830 first_instr = (unsigned char*) PyBytes_AS_STRING(co->co_code);
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	831 /* An explanation is in order for the next line.
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	832
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	833 f->f_lasti now refers to the index of the last instruction
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	834 executed. You might think this was obvious from the name, but
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	835 this wasn't always true before 2.3! PyFrame_New now sets
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	836 f->f_lasti to -1 (i.e. the index before the first instruction)
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	837 and YIELD_VALUE doesn't fiddle with f_lasti any more. So this
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	838 does work. Promise.
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	839
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	840 When the PREDICT() macros are enabled, some opcode pairs follow in
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	841 direct succession without updating f->f_lasti. A successful
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	842 prediction effectively links the two codes together as if they
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	843 were a single new opcode; accordingly,f->f_lasti will point to
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	844 the first code in the pair (for instance, GET_ITER followed by
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	845 FOR_ITER is effectively a single opcode and f->f_lasti will point
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	846 at to the beginning of the combined pair.)
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	847 */
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	848 next_instr = first_instr + f->f_lasti + 1;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	849 stack_pointer = f->f_stacktop;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	850 assert(stack_pointer != NULL);
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	851 f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	852
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	853 if (f->f_code->co_flags & CO_GENERATOR) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	854 if (f->f_exc_type != NULL && f->f_exc_type != Py_None) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	855 /* We were in an except handler when we left,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	856 restore the exception state which was put aside
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	857 (see YIELD_VALUE). */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	858 SWAP_EXC_STATE();
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	859 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	860 else {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	861 SAVE_EXC_STATE();
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	862 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	863 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	864
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	865 #ifdef LLTRACE
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	866 lltrace = PyDict_GetItemString(f->f_globals, "__lltrace__") != 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	867 #endif
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	868 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	869 filename = _PyUnicode_AsString(co->co_filename);
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	870 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	871
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	872 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	873 err = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	874 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	875 w = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	876
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	877 if (throwflag) { /* support for generator.throw() */
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	878 why = WHY_EXCEPTION;
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	879 goto on_error;
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	880 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	881
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	882 for (;;) {
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	883 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	884 if (inst1 == 0) {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	885 /* Almost surely, the opcode executed a break
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	886 or a continue, preventing inst1 from being set
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	887 on the way out of the loop.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	888 */
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	889 READ_TIMESTAMP(inst1);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	890 loop1 = inst1;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	891 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	892 dump_tsc(opcode, ticked, inst0, inst1, loop0, loop1,
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	893 intr0, intr1);
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	894 ticked = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	895 inst1 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	896 intr0 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	897 intr1 = 0;
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	898 READ_TIMESTAMP(loop0);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	899 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	900 assert(stack_pointer >= f->f_valuestack); /* else underflow */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	901 assert(STACK_LEVEL() <= co->co_stacksize); /* else overflow */
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	902
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	903 /* 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	904 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	905 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	906 ``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	907 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	908 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	909 Py_MakePendingCalls() above. */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	910
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	911 if (--_Py_Ticker < 0) {
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	912 if (*next_instr == SETUP_FINALLY) {
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	913 /* Make the last opcode before
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	914 a try: finally: block uninterruptable. */
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	915 goto fast_next_opcode;
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	916 }
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	917 _Py_Ticker = _Py_CheckInterval;
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	918 tstate->tick_counter++;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	919 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	920 ticked = 1;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	921 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	922 if (things_to_do) {
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	923 if (Py_MakePendingCalls() < 0) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	924 why = WHY_EXCEPTION;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	925 goto on_error;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	926 }
34020 be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	927 if (things_to_do)
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	928 /* MakePendingCalls() didn't succeed.
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	929 Force early re-execution of this
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	930 "periodic" code, possibly after
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	931 a thread switch */
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	932 _Py_Ticker = 0;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	933 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	934 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	935 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	936 /* Give another thread a chance */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	937
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	938 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	939 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	940 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	941
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	942 /* Other threads may run now */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	943
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	944 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	945 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	946 Py_FatalError("ceval: orphan tstate");
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	947
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	948 /* Check for thread interrupts */
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	949
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	950 if (tstate->async_exc != NULL) {
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	951 x = tstate->async_exc;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	952 tstate->async_exc = NULL;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	953 PyErr_SetNone(x);
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	954 Py_DECREF(x);
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	955 why = WHY_EXCEPTION;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	956 goto on_error;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	957 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	958 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	959 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	960 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	961
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	962 fast_next_opcode:
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	963 f->f_lasti = INSTR_OFFSET();
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	964
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	965 /* line-by-line tracing support */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	966
50133 33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	967 if (_Py_TracingPossible &&
33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	968 tstate->c_tracefunc != NULL && !tstate->tracing) {
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	969 /* see maybe_call_line_trace
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	970 for expository comments */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	971 f->f_stacktop = stack_pointer;
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	972
28886 af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	973 err = maybe_call_line_trace(tstate->c_tracefunc,
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	974 tstate->c_traceobj,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	975 f, &instr_lb, &instr_ub,
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	976 &instr_prev);
28886 af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	977 /* Reload possibly changed frame fields */
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	978 JUMPTO(f->f_lasti);
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	979 if (f->f_stacktop != NULL) {
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	980 stack_pointer = f->f_stacktop;
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	981 f->f_stacktop = NULL;
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	982 }
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	983 if (err) {
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	984 /* trace function raised an exception */
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	985 goto on_error;
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	986 }
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	987 }
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	988
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	989 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	990
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	991 opcode = NEXTOP();
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	992 oparg = 0; /* allows oparg to be stored in a register because
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	993 it doesn't have to be remembered across a full loop */
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	994 if (HAS_ARG(opcode))
310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	995 oparg = NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	996 dispatch_opcode:
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	997 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	998 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	999 dxpairs[lastopcode][opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1000 lastopcode = opcode;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1001 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1002 dxp[opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1003 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1004
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1005 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1006 /* Instruction tracing */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1007
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1008 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1009 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1010 printf("%d: %d, %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1011 f->f_lasti, opcode, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1012 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1013 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1014 printf("%d: %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1015 f->f_lasti, opcode);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1016 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1017 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1018 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1019
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1020 /* Main switch on opcode */
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	1021 READ_TIMESTAMP(inst0);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1022
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1023 switch (opcode) {
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 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1026 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	1027 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	1028 and that no operation that succeeds does this! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1029
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1030 /* case STOP_CODE: this is an error! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1031
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32359 diff changeset	1032 case NOP:
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32359 diff changeset	1033 goto fast_next_opcode;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32359 diff changeset	1034
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1035 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	1036 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	1037 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	1038 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	1039 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	1040 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	1041 }
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1042 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	1043 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	1044 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	1045 break;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1046
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1047 case LOAD_CONST:
24545 d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	1048 x = GETITEM(consts, oparg);
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1049 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	1050 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	1051 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	1052
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	1053 PREDICTED_WITH_ARG(STORE_FAST);
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1054 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	1055 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	1056 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	1057 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	1058
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1059 PREDICTED(POP_TOP);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1060 case POP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1061 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1062 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	1063 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1064
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1065 case ROT_TWO:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1066 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1067 w = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1068 SET_TOP(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1069 SET_SECOND(v);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	1070 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1071
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1072 case ROT_THREE:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1073 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1074 w = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1075 x = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1076 SET_TOP(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1077 SET_SECOND(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1078 SET_THIRD(v);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	1079 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1080
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1081 case ROT_FOUR:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1082 u = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1083 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1084 w = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1085 x = FOURTH();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1086 SET_TOP(v);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1087 SET_SECOND(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1088 SET_THIRD(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1089 SET_FOURTH(u);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	1090 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1091
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1092 case DUP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1093 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1094 Py_INCREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1095 PUSH(v);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	1096 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1097
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1098 case DUP_TOPX:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1099 if (oparg == 2) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1100 x = TOP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1101 Py_INCREF(x);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1102 w = SECOND();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1103 Py_INCREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1104 STACKADJ(2);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1105 SET_TOP(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1106 SET_SECOND(w);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1107 goto fast_next_opcode;
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1108 } else if (oparg == 3) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1109 x = TOP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1110 Py_INCREF(x);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1111 w = SECOND();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1112 Py_INCREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1113 v = THIRD();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1114 Py_INCREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1115 STACKADJ(3);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1116 SET_TOP(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1117 SET_SECOND(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1118 SET_THIRD(v);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1119 goto fast_next_opcode;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1120 }
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1121 Py_FatalError("invalid argument to DUP_TOPX"
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1122 " (bytecode corruption?)");
50113 fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	1123 /* Never returns, so don't bother to set why. */
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1124 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1125
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1126 case UNARY_POSITIVE:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1127 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1128 x = PyNumber_Positive(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1129 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1130 SET_TOP(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	1131 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1132 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1133
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1134 case UNARY_NEGATIVE:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1135 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1136 x = PyNumber_Negative(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1137 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1138 SET_TOP(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	1139 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1140 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1141
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1142 case UNARY_NOT:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1143 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1144 err = PyObject_IsTrue(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1145 Py_DECREF(v);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1146 if (err == 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1147 Py_INCREF(Py_True);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1148 SET_TOP(Py_True);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1149 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1150 }
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1151 else if (err > 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1152 Py_INCREF(Py_False);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1153 SET_TOP(Py_False);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1154 err = 0;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1155 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1156 }
27243 3afbd55fb18f Replaced POP() with STACKADJ(-1) on lines where the result wasn't used. Raymond Hettinger <python@rcn.com> parents: 27201 diff changeset	1157 STACKADJ(-1);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1158 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1159
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1160 case UNARY_INVERT:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1161 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1162 x = PyNumber_Invert(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1163 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1164 SET_TOP(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	1165 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1166 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1167
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1168 case BINARY_POWER:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1169 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1170 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1171 x = PyNumber_Power(v, w, Py_None);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1172 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1173 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1174 SET_TOP(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	1175 if (x != NULL) continue;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1176 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1177
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1178 case BINARY_MULTIPLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1179 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1180 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1181 x = PyNumber_Multiply(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1182 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1183 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1184 SET_TOP(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	1185 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1186 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1187
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	1188 case BINARY_TRUE_DIVIDE:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1189 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1190 v = TOP();
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	1191 x = PyNumber_TrueDivide(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1192 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1193 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1194 SET_TOP(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	1195 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1196 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1197
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1198 case BINARY_FLOOR_DIVIDE:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1199 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1200 v = TOP();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1201 x = PyNumber_FloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1202 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1203 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1204 SET_TOP(x);
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1205 if (x != NULL) continue;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1206 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1207
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1208 case BINARY_MODULO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1209 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1210 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1211 x = PyNumber_Remainder(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1212 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1213 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1214 SET_TOP(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	1215 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1216 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1217
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1218 case BINARY_ADD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1219 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1220 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1221 if (PyUnicode_CheckExact(v) &&
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1222 PyUnicode_CheckExact(w)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1223 x = unicode_concatenate(v, w, f, next_instr);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1224 /* unicode_concatenate consumed the ref to v */
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1225 goto skip_decref_vx;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1226 }
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 else {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1228 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	1229 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1230 Py_DECREF(v);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1231 skip_decref_vx:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1232 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1233 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1234 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1235 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1236
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1237 case BINARY_SUBTRACT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1238 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1239 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1240 x = PyNumber_Subtract(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1241 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1242 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1243 SET_TOP(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	1244 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1245 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1246
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1247 case BINARY_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1248 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1249 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1250 x = PyObject_GetItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1251 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1252 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1253 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1254 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1255 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1256
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1257 case BINARY_LSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1258 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1259 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1260 x = PyNumber_Lshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1261 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1262 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1263 SET_TOP(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	1264 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1265 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1266
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1267 case BINARY_RSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1268 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1269 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1270 x = PyNumber_Rshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1271 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1272 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1273 SET_TOP(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	1274 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1275 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1276
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1277 case BINARY_AND:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1278 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1279 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1280 x = PyNumber_And(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1281 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1282 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1283 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1284 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1285 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1286
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1287 case BINARY_XOR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1288 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1289 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1290 x = PyNumber_Xor(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1291 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1292 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1293 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1294 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1295 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1296
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1297 case BINARY_OR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1298 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1299 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1300 x = PyNumber_Or(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1301 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1302 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1303 SET_TOP(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	1304 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1305 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1306
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1307 case LIST_APPEND:
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1308 w = POP();
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1309 v = POP();
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1310 err = PyList_Append(v, w);
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1311 Py_DECREF(v);
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1312 Py_DECREF(w);
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1313 if (err == 0) {
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1314 PREDICT(JUMP_ABSOLUTE);
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1315 continue;
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1316 }
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1317 break;
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1318
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1319 case SET_ADD:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1320 w = POP();
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1321 v = POP();
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1322 err = PySet_Add(v, w);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1323 Py_DECREF(v);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1324 Py_DECREF(w);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1325 if (err == 0) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1326 PREDICT(JUMP_ABSOLUTE);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1327 continue;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1328 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1329 break;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1330
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1331 case INPLACE_POWER:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1332 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1333 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1334 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	1335 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1336 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1337 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1338 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1339 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1340
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1341 case INPLACE_MULTIPLY:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1342 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1343 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1344 x = PyNumber_InPlaceMultiply(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1345 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1346 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1347 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1348 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1349 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1350
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1351 case INPLACE_TRUE_DIVIDE:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1352 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1353 v = TOP();
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1354 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	1355 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1356 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1357 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1358 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1359 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1360
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1361 case INPLACE_FLOOR_DIVIDE:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1362 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1363 v = TOP();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1364 x = PyNumber_InPlaceFloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1365 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1366 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1367 SET_TOP(x);
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1368 if (x != NULL) continue;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1369 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1370
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1371 case INPLACE_MODULO:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1372 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1373 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1374 x = PyNumber_InPlaceRemainder(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1375 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1376 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1377 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1378 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1379 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1380
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1381 case INPLACE_ADD:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1382 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1383 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1384 if (PyUnicode_CheckExact(v) &&
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1385 PyUnicode_CheckExact(w)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1386 x = unicode_concatenate(v, w, f, next_instr);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1387 /* unicode_concatenate consumed the ref to v */
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1388 goto skip_decref_v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1389 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1390 else {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1391 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	1392 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1393 Py_DECREF(v);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1394 skip_decref_v:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1395 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1396 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1397 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1398 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1399
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1400 case INPLACE_SUBTRACT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1401 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1402 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1403 x = PyNumber_InPlaceSubtract(v, w);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1404 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1405 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1406 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1407 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1408 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1409
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1410 case INPLACE_LSHIFT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1411 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1412 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1413 x = PyNumber_InPlaceLshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1414 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1415 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1416 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1417 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1418 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1419
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1420 case INPLACE_RSHIFT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1421 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1422 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1423 x = PyNumber_InPlaceRshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1424 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1425 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1426 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1427 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1428 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1429
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1430 case INPLACE_AND:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1431 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1432 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1433 x = PyNumber_InPlaceAnd(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1434 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1435 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1436 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1437 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1438 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1439
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1440 case INPLACE_XOR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1441 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1442 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1443 x = PyNumber_InPlaceXor(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1444 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1445 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1446 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1447 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1448 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1449
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1450 case INPLACE_OR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1451 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1452 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1453 x = PyNumber_InPlaceOr(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1454 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1455 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1456 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1457 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1458 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1459
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1460 case STORE_SUBSCR:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1461 w = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1462 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1463 u = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1464 STACKADJ(-3);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1465 /* v[w] = u */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1466 err = PyObject_SetItem(v, w, u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1467 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1468 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1469 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	1470 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1471 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1472
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1473 case DELETE_SUBSCR:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1474 w = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1475 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1476 STACKADJ(-2);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1477 /* del v[w] */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1478 err = PyObject_DelItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1479 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1480 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	1481 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1482 break;
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1483
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1484 case PRINT_EXPR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1485 v = POP();
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1486 w = PySys_GetObject("displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1487 if (w == NULL) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1488 PyErr_SetString(PyExc_RuntimeError,
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1489 "lost sys.displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1490 err = -1;
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1491 x = NULL;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1492 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1493 if (err == 0) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29669 diff changeset	1494 x = PyTuple_Pack(1, v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1495 if (x == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1496 err = -1;
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1497 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1498 if (err == 0) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1499 w = PyEval_CallObject(w, x);
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1500 Py_XDECREF(w);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1501 if (w == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1502 err = -1;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1503 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1504 Py_DECREF(v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1505 Py_XDECREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1506 break;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1507
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1508 #ifdef CASE_TOO_BIG
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1509 default: switch (opcode) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1510 #endif
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	1511 case RAISE_VARARGS:
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	1512 v = w = NULL;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1513 switch (oparg) {
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	1514 case 2:
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	1515 v = POP(); /* cause */
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	1516 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	1517 w = POP(); /* exc */
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	1518 case 0: /* Fallthrough */
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	1519 why = do_raise(w, v);
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	1520 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	1521 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1522 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	1523 "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	1524 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	1525 break;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1526 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1527 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1528
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1529 case STORE_LOCALS:
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1530 x = POP();
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1531 v = f->f_locals;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1532 Py_XDECREF(v);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1533 f->f_locals = x;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1534 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1535
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1536 case RETURN_VALUE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1537 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1538 why = WHY_RETURN;
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1539 goto fast_block_end;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1540
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	1541 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	1542 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	1543 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	1544 why = WHY_YIELD;
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1545 /* Put aside the current exception state and restore
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1546 that of the calling frame. This only serves when
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1547 "yield" is used inside an except handler. */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1548 SWAP_EXC_STATE();
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1549 goto fast_yield;
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	1550
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1551 case POP_EXCEPT:
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1552 {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1553 PyTryBlock *b = PyFrame_BlockPop(f);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1554 if (b->b_type != EXCEPT_HANDLER) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1555 PyErr_SetString(PyExc_SystemError,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1556 "popped block is not an except handler");
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1557 why = WHY_EXCEPTION;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1558 break;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1559 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1560 UNWIND_EXCEPT_HANDLER(b);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1561 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1562 continue;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 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 POP_BLOCK:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1565 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1566 PyTryBlock *b = PyFrame_BlockPop(f);
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1567 UNWIND_BLOCK(b);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1568 }
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1569 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1570
45635 882eba145119 Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45017 diff changeset	1571 PREDICTED(END_FINALLY);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1572 case END_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1573 v = POP();
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	1574 if (PyLong_Check(v)) {
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	1575 why = (enum why_code) PyLong_AS_LONG(v);
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	1576 assert(why != WHY_YIELD);
31900 0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	1577 if (why == WHY_RETURN \|\|
0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	1578 why == WHY_CONTINUE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1579 retval = POP();
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1580 if (why == WHY_SILENCED) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1581 /* An exception was silenced by 'with', we must
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1582 manually unwind the EXCEPT_HANDLER block which was
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1583 created when the exception was caught, otherwise
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1584 the stack will be in an inconsistent state. */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1585 PyTryBlock *b = PyFrame_BlockPop(f);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1586 if (b->b_type != EXCEPT_HANDLER) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1587 PyErr_SetString(PyExc_SystemError,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1588 "popped block is not an except handler");
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1589 why = WHY_EXCEPTION;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1590 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1591 else {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1592 UNWIND_EXCEPT_HANDLER(b);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1593 why = WHY_NOT;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1594 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1595 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1596 }
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	1597 else if (PyExceptionClass_Check(v)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1598 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	1599 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1600 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	1601 why = WHY_RERAISE;
2872 d3b07ba3e12d fix bogus DECREF in finally clause Guido van Rossum <guido@python.org> parents: 2866 diff changeset	1602 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1603 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1604 else if (v != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1605 PyErr_SetString(PyExc_SystemError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1606 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1607 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1608 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1609 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1610 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1611
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1612 case LOAD_BUILD_CLASS:
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1613 x = PyDict_GetItemString(f->f_builtins,
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1614 "__build_class__");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1615 if (x == NULL) {
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1616 PyErr_SetString(PyExc_ImportError,
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1617 "__build_class__ not found");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1618 break;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1619 }
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1620 Py_INCREF(x);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1621 PUSH(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1622 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1623
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1624 case STORE_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1625 w = GETITEM(names, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1626 v = POP();
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1627 if ((x = f->f_locals) != NULL) {
32890 b8c2aa2be19a Completed the patch for Bug #215126. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	1628 if (PyDict_CheckExact(x))
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1629 err = PyDict_SetItem(x, w, v);
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1630 else
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1631 err = PyObject_SetItem(x, w, v);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1632 Py_DECREF(v);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1633 if (err == 0) continue;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1634 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1635 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1636 PyErr_Format(PyExc_SystemError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1637 "no locals found when storing %R", w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1638 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1639
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1640 case DELETE_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1641 w = GETITEM(names, oparg);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1642 if ((x = f->f_locals) != NULL) {
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1643 if ((err = PyObject_DelItem(x, w)) != 0)
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1644 format_exc_check_arg(PyExc_NameError,
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1645 NAME_ERROR_MSG,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1646 w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1647 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1648 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1649 PyErr_Format(PyExc_SystemError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1650 "no locals when deleting %R", w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1651 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1652
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	1653 PREDICTED_WITH_ARG(UNPACK_SEQUENCE);
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13881 diff changeset	1654 case UNPACK_SEQUENCE:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1655 v = POP();
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1656 if (PyTuple_CheckExact(v) &&
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1657 PyTuple_GET_SIZE(v) == oparg) {
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1658 PyObject **items = \
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1659 ((PyTupleObject *)v)->ob_item;
31630 b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1660 while (oparg--) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1661 w = items[oparg];
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1662 Py_INCREF(w);
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1663 PUSH(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1664 }
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1665 Py_DECREF(v);
4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1666 continue;
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1667 } else if (PyList_CheckExact(v) &&
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1668 PyList_GET_SIZE(v) == oparg) {
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1669 PyObject **items = \
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1670 ((PyListObject *)v)->ob_item;
31630 b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1671 while (oparg--) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1672 w = items[oparg];
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1673 Py_INCREF(w);
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1674 PUSH(w);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1675 }
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1676 } else if (unpack_iterable(v, oparg, -1,
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1677 stack_pointer + oparg)) {
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	1678 stack_pointer += oparg;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1679 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1680 /* unpack_iterable() raised an exception */
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1681 why = WHY_EXCEPTION;
20183 c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1682 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1683 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1684 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1685
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1686 case UNPACK_EX:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1687 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1688 int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1689 v = POP();
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	1690
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1691 if (unpack_iterable(v, oparg & 0xFF, oparg >> 8,
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1692 stack_pointer + totalargs)) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1693 stack_pointer += totalargs;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1694 } else {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1695 why = WHY_EXCEPTION;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1696 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1697 Py_DECREF(v);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1698 break;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1699 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1700
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1701 case STORE_ATTR:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1702 w = GETITEM(names, oparg);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1703 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1704 u = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1705 STACKADJ(-2);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1706 err = PyObject_SetAttr(v, w, u); /* v.w = u */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1707 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1708 Py_DECREF(u);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1709 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1710 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1711
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1712 case DELETE_ATTR:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1713 w = GETITEM(names, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1714 v = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1715 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	1716 /* del v.w */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1717 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1718 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1719
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1720 case STORE_GLOBAL:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1721 w = GETITEM(names, oparg);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1722 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1723 err = PyDict_SetItem(f->f_globals, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1724 Py_DECREF(v);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1725 if (err == 0) continue;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1726 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1727
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1728 case DELETE_GLOBAL:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1729 w = GETITEM(names, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1730 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	1731 format_exc_check_arg(
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1732 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	1733 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1734
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1735 case LOAD_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1736 w = GETITEM(names, oparg);
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1737 if ((v = f->f_locals) == NULL) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1738 PyErr_Format(PyExc_SystemError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1739 "no locals when loading %R", w);
50113 fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	1740 why = WHY_EXCEPTION;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1741 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1742 }
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1743 if (PyDict_CheckExact(v)) {
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1744 x = PyDict_GetItem(v, w);
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1745 Py_XINCREF(x);
ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1746 }
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1747 else {
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1748 x = PyObject_GetItem(v, w);
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1749 if (x == NULL && PyErr_Occurred()) {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1750 if (!PyErr_ExceptionMatches(
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1751 PyExc_KeyError))
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1752 break;
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1753 PyErr_Clear();
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1754 }
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1755 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1756 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1757 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	1758 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1759 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	1760 if (x == NULL) {
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1761 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1762 PyExc_NameError,
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1763 NAME_ERROR_MSG, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1764 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1765 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1766 }
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1767 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1768 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1769 PUSH(x);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1770 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1771
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1772 case LOAD_GLOBAL:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1773 w = GETITEM(names, oparg);
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	1774 if (PyUnicode_CheckExact(w)) {
24900 2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	1775 /* Inline the PyDict_GetItem() calls.
2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	1776 WARNING: this is an extreme speed hack.
2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	1777 Do not try this at home. */
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	1778 long hash = ((PyUnicodeObject *)w)->hash;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1779 if (hash != -1) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1780 PyDictObject *d;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1781 PyDictEntry *e;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1782 d = (PyDictObject *)(f->f_globals);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1783 e = d->ma_lookup(d, w, hash);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1784 if (e == NULL) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1785 x = NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1786 break;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1787 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1788 x = e->me_value;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1789 if (x != NULL) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1790 Py_INCREF(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1791 PUSH(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1792 continue;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1793 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1794 d = (PyDictObject *)(f->f_builtins);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1795 e = d->ma_lookup(d, w, hash);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1796 if (e == NULL) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1797 x = NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1798 break;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1799 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1800 x = e->me_value;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1801 if (x != NULL) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1802 Py_INCREF(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1803 PUSH(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1804 continue;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1805 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1806 goto load_global_error;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1807 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1808 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1809 /* This is the un-inlined version of the code above */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1810 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	1811 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1812 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	1813 if (x == NULL) {
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1814 load_global_error:
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1815 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1816 PyExc_NameError,
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1817 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	1818 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1819 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1820 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1821 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1822 PUSH(x);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1823 continue;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1824
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1825 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	1826 x = GETLOCAL(oparg);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1827 if (x != NULL) {
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1828 SETLOCAL(oparg, NULL);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1829 continue;
8318 ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1830 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1831 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1832 PyExc_UnboundLocalError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1833 UNBOUNDLOCAL_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1834 PyTuple_GetItem(co->co_varnames, oparg)
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1835 );
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1836 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1837
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1838 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	1839 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1840 Py_INCREF(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1841 PUSH(x);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1842 if (x != NULL) continue;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1843 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1844
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1845 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	1846 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1847 w = PyCell_Get(x);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1848 if (w != NULL) {
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1849 PUSH(w);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1850 continue;
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1851 }
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1852 err = -1;
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1853 /* Don't stomp existing exception */
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1854 if (PyErr_Occurred())
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1855 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1856 if (oparg < PyTuple_GET_SIZE(co->co_cellvars)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1857 v = PyTuple_GET_ITEM(co->co_cellvars,
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1858 oparg);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1859 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1860 PyExc_UnboundLocalError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1861 UNBOUNDLOCAL_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1862 v);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1863 } else {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1864 v = PyTuple_GET_ITEM(co->co_freevars, oparg -
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1865 PyTuple_GET_SIZE(co->co_cellvars));
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1866 format_exc_check_arg(PyExc_NameError,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1867 UNBOUNDFREE_ERROR_MSG, v);
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1868 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1869 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1870
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1871 case STORE_DEREF:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1872 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	1873 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1874 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	1875 Py_DECREF(w);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1876 continue;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1877
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1878 case BUILD_TUPLE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1879 x = PyTuple_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1880 if (x != NULL) {
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	1881 for (; --oparg >= 0;) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1882 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1883 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	1884 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1885 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	1886 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1887 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1888 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1889
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1890 case BUILD_LIST:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1891 x = PyList_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1892 if (x != NULL) {
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	1893 for (; --oparg >= 0;) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1894 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	1895 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	1896 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1897 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	1898 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1899 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1900 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1901
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1902 case BUILD_SET:
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1903 x = PySet_New(NULL);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1904 if (x != NULL) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1905 for (; --oparg >= 0;) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1906 w = POP();
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1907 if (err == 0)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1908 err = PySet_Add(x, w);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1909 Py_DECREF(w);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1910 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1911 if (err != 0) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1912 Py_DECREF(x);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1913 break;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1914 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1915 PUSH(x);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1916 continue;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1917 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1918 break;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1919
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1920 case BUILD_MAP:
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1921 x = _PyDict_NewPresized((Py_ssize_t)oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1922 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	1923 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1924 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1925
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1926 case STORE_MAP:
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1927 w = TOP(); /* key */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1928 u = SECOND(); /* value */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1929 v = THIRD(); /* dict */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1930 STACKADJ(-2);
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1931 assert (PyDict_CheckExact(v));
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1932 err = PyDict_SetItem(v, w, u); /* v[w] = u */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1933 Py_DECREF(u);
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1934 Py_DECREF(w);
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1935 if (err == 0) continue;
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1936 break;
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	1937
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1938 case LOAD_ATTR:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1939 w = GETITEM(names, oparg);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1940 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1941 x = PyObject_GetAttr(v, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1942 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1943 SET_TOP(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	1944 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1945 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1946
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1947 case COMPARE_OP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1948 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1949 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1950 x = cmp_outcome(oparg, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1951 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1952 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1953 SET_TOP(x);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1954 if (x == NULL) break;
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1955 PREDICT(JUMP_IF_FALSE);
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1956 PREDICT(JUMP_IF_TRUE);
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1957 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1958
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1959 case IMPORT_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1960 w = GETITEM(names, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1961 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	1962 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1963 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	1964 "__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	1965 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1966 }
44905 c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1967 Py_INCREF(x);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1968 v = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1969 u = TOP();
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	1970 if (PyLong_AsLong(u) != -1 \|\| PyErr_Occurred())
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1971 w = PyTuple_Pack(5,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1972 w,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1973 f->f_globals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1974 f->f_locals == NULL ?
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1975 Py_None : f->f_locals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1976 v,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1977 u);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1978 else
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1979 w = PyTuple_Pack(4,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1980 w,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1981 f->f_globals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1982 f->f_locals == NULL ?
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1983 Py_None : f->f_locals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1984 v);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1985 Py_DECREF(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1986 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	1987 if (w == NULL) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1988 u = POP();
44905 c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1989 Py_DECREF(x);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1990 x = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1991 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1992 }
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	1993 READ_TIMESTAMP(intr0);
44905 c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1994 v = x;
c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1995 x = PyEval_CallObject(v, w);
c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1996 Py_DECREF(v);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	1997 READ_TIMESTAMP(intr1);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1998 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1999 SET_TOP(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	2000 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2001 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2002
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2003 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	2004 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2005 PyFrame_FastToLocals(f);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2006 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	2007 PyErr_SetString(PyExc_SystemError,
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	2008 "no locals found during 'import *'");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2009 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2010 }
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2011 READ_TIMESTAMP(intr0);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2012 err = import_all_from(x, v);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2013 READ_TIMESTAMP(intr1);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2014 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	2015 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	2016 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2017 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2018
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2019 case IMPORT_FROM:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2020 w = GETITEM(names, oparg);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2021 v = TOP();
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2022 READ_TIMESTAMP(intr0);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2023 x = import_from(v, w);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2024 READ_TIMESTAMP(intr1);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2025 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	2026 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	2027 break;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2028
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2029 case JUMP_FORWARD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2030 JUMPBY(oparg);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2031 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2032
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2033 PREDICTED_WITH_ARG(JUMP_IF_FALSE);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2034 case JUMP_IF_FALSE:
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2035 w = TOP();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2036 if (w == Py_True) {
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2037 PREDICT(POP_TOP);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2038 goto fast_next_opcode;
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2039 }
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2040 if (w == Py_False) {
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2041 JUMPBY(oparg);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2042 goto fast_next_opcode;
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2043 }
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2044 err = PyObject_IsTrue(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2045 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2046 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2047 else if (err == 0)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2048 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	2049 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2050 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2051 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2052
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2053 PREDICTED_WITH_ARG(JUMP_IF_TRUE);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2054 case JUMP_IF_TRUE:
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2055 w = TOP();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2056 if (w == Py_False) {
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2057 PREDICT(POP_TOP);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2058 goto fast_next_opcode;
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2059 }
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2060 if (w == Py_True) {
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2061 JUMPBY(oparg);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2062 goto fast_next_opcode;
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2063 }
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2064 err = PyObject_IsTrue(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2065 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2066 err = 0;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2067 JUMPBY(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2068 }
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2069 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	2070 ;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2071 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2072 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2073 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2074
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	2075 PREDICTED_WITH_ARG(JUMP_ABSOLUTE);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2076 case JUMP_ABSOLUTE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2077 JUMPTO(oparg);
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2078 #if FAST_LOOPS
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2079 /* Enabling this path speeds-up all while and for-loops by bypassing
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2080 the per-loop checks for signals. By default, this should be turned-off
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2081 because it prevents detection of a control-break in tight loops like
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2082 "while 1: pass". Compile with this option turned-on when you need
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2083 the speed-up and do not need break checking inside tight loops (ones
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2084 that contain only instructions ending with goto fast_next_opcode).
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2085 */
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2086 goto fast_next_opcode;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2087 #else
29337 f9495815c18f Don't use fast_next_opcode for JUMP_* opcodes. This fixes the problem Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28886 diff changeset	2088 continue;
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2089 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2090
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2091 case GET_ITER:
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2092 /* before: [obj]; after [getiter(obj)] */
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2093 v = TOP();
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2094 x = PyObject_GetIter(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2095 Py_DECREF(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2096 if (x != NULL) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2097 SET_TOP(x);
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2098 PREDICT(FOR_ITER);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2099 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2100 }
27243 3afbd55fb18f Replaced POP() with STACKADJ(-1) on lines where the result wasn't used. Raymond Hettinger <python@rcn.com> parents: 27201 diff changeset	2101 STACKADJ(-1);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2102 break;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2103
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2104 PREDICTED_WITH_ARG(FOR_ITER);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2105 case FOR_ITER:
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2106 /* before: [iter]; after: [iter, iter()] or [] */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2107 v = TOP();
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2108 x = (*v->ob_type->tp_iternext)(v);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2109 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	2110 PUSH(x);
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2111 PREDICT(STORE_FAST);
b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2112 PREDICT(UNPACK_SEQUENCE);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2113 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2114 }
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2115 if (PyErr_Occurred()) {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2116 if (!PyErr_ExceptionMatches(
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2117 PyExc_StopIteration))
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2118 break;
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2119 PyErr_Clear();
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2120 }
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2121 /* iterator ended normally */
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2122 x = v = POP();
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2123 Py_DECREF(v);
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2124 JUMPBY(oparg);
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2125 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2126
31647 d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2127 case BREAK_LOOP:
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2128 why = WHY_BREAK;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2129 goto fast_block_end;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2130
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2131 case CONTINUE_LOOP:
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	2132 retval = PyLong_FromLong(oparg);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2133 if (!retval) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2134 x = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2135 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2136 }
31647 d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2137 why = WHY_CONTINUE;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2138 goto fast_block_end;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2139
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2140 case SETUP_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2141 case SETUP_EXCEPT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2142 case SETUP_FINALLY:
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2143 /* NOTE: If you add any new block-setup opcodes that
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2144 are not try/except/finally handlers, you may need
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2145 to update the PyGen_NeedsFinalizing() function.
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2146 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2147
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2148 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2149 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	2150 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2151
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2152 case WITH_CLEANUP:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2153 {
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2154 /* At the top of the stack are 1-3 values indicating
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2155 how/why we entered the finally clause:
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2156 - TOP = None
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2157 - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2158 - TOP = WHY_*; no retval below it
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2159 - (TOP, SECOND, THIRD) = exc_info()
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2160 Below them is EXIT, the context.__exit__ bound method.
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2161 In the last case, we must call
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2162 EXIT(TOP, SECOND, THIRD)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2163 otherwise we must call
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2164 EXIT(None, None, None)
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2165
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2166 In all cases, we remove EXIT from the stack, leaving
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2167 the rest in the same order.
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2168
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2169 In addition, if the stack represents an exception,
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2170 and the function call returns a 'true' value, we
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2171 "zap" this information, to prevent END_FINALLY from
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2172 re-raising the exception. (But non-local gotos
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2173 should still be resumed.)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2174 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2175
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2176 PyObject *exit_func = POP();
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2177 u = TOP();
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2178 if (u == Py_None) {
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2179 v = w = Py_None;
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2180 }
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2181 else if (PyLong_Check(u)) {
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2182 u = v = w = Py_None;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2183 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2184 else {
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2185 v = SECOND();
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2186 w = THIRD();
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2187 }
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2188 /* XXX Not the fastest way to call it... */
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2189 x = PyObject_CallFunctionObjArgs(exit_func, u, v, w,
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2190 NULL);
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2191 Py_DECREF(exit_func);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2192 if (x == NULL)
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2193 break; /* Go to error exit */
50105 26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2194
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2195 if (u != Py_None)
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2196 err = PyObject_IsTrue(x);
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2197 else
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2198 err = 0;
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2199 Py_DECREF(x);
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2200
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2201 if (err < 0)
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2202 break; /* Go to error exit */
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2203 else if (err > 0) {
26518d41a186 Merged revisions 67689 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48986 diff changeset	2204 err = 0;
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2205 /* There was an exception and a True return */
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2206 STACKADJ(-2);
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2207 SET_TOP(PyLong_FromLong((long) WHY_SILENCED));
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2208 Py_DECREF(u);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2209 Py_DECREF(v);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2210 Py_DECREF(w);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2211 }
45635 882eba145119 Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45017 diff changeset	2212 PREDICT(END_FINALLY);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2213 break;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2214 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2215
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	2216 case CALL_FUNCTION:
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2217 {
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2218 PyObject **sp;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2219 PCALL(PCALL_ALL);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2220 sp = stack_pointer;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2221 #ifdef WITH_TSC
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2222 x = call_function(&sp, oparg, &intr0, &intr1);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2223 #else
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2224 x = call_function(&sp, oparg);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2225 #endif
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2226 stack_pointer = sp;
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2227 PUSH(x);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2228 if (x != NULL)
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2229 continue;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2230 break;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2231 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2232
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2233 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	2234 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	2235 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	2236 {
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2237 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	2238 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	2239 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	2240 int n = na + 2 * nk;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2241 PyObject *pfunc, func, **sp;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2242 PCALL(PCALL_ALL);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2243 if (flags & CALL_FLAG_VAR)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2244 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2245 if (flags & CALL_FLAG_KW)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2246 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2247 pfunc = stack_pointer - n - 1;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2248 func = *pfunc;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2249
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2250 if (PyMethod_Check(func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2251 && PyMethod_GET_SELF(func) != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2252 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	2253 Py_INCREF(self);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2254 func = PyMethod_GET_FUNCTION(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2255 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	2256 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	2257 *pfunc = self;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2258 na++;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2259 n++;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2260 } else
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2261 Py_INCREF(func);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2262 sp = stack_pointer;
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2263 READ_TIMESTAMP(intr0);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2264 x = ext_do_call(func, &sp, flags, na, nk);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2265 READ_TIMESTAMP(intr1);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2266 stack_pointer = sp;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2267 Py_DECREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2268
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2269 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	2270 w = POP();
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2271 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	2272 }
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2273 PUSH(x);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2274 if (x != NULL)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2275 continue;
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2276 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	2277 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2278
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2279 case MAKE_CLOSURE:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2280 case MAKE_FUNCTION:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2281 {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2282 int posdefaults = oparg & 0xff;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2283 int kwdefaults = (oparg>>8) & 0xff;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2284 int num_annotations = (oparg >> 16) & 0x7fff;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2285
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2286 v = POP(); /* code object */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2287 x = PyFunction_New(v, f->f_globals);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2288 Py_DECREF(v);
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2289
40943 c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2290 if (x != NULL && opcode == MAKE_CLOSURE) {
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2291 v = POP();
50113 fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2292 if (PyFunction_SetClosure(x, v) != 0) {
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2293 /* Can't happen unless bytecode is corrupt. */
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2294 why = WHY_EXCEPTION;
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2295 }
40943 c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2296 Py_DECREF(v);
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2297 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2298
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2299 if (x != NULL && num_annotations > 0) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2300 Py_ssize_t name_ix;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2301 u = POP(); /* names of args with annotations */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2302 v = PyDict_New();
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2303 if (v == NULL) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2304 Py_DECREF(x);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2305 x = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2306 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2307 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2308 name_ix = PyTuple_Size(u);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2309 assert(num_annotations == name_ix+1);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2310 while (name_ix > 0) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2311 --name_ix;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2312 t = PyTuple_GET_ITEM(u, name_ix);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2313 w = POP();
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2314 /* XXX(nnorwitz): check for errors */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2315 PyDict_SetItem(v, t, w);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2316 Py_DECREF(w);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2317 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2318
50113 fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2319 if (PyFunction_SetAnnotations(x, v) != 0) {
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2320 /* Can't happen unless
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2321 PyFunction_SetAnnotations changes. */
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2322 why = WHY_EXCEPTION;
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2323 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2324 Py_DECREF(v);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2325 Py_DECREF(u);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2326 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2327
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2328 /* XXX Maybe this should be a separate opcode? */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2329 if (x != NULL && posdefaults > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2330 v = PyTuple_New(posdefaults);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2331 if (v == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2332 Py_DECREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2333 x = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2334 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2335 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2336 while (--posdefaults >= 0) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2337 w = POP();
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2338 PyTuple_SET_ITEM(v, posdefaults, w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2339 }
50113 fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2340 if (PyFunction_SetDefaults(x, v) != 0) {
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2341 /* Can't happen unless
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2342 PyFunction_SetDefaults changes. */
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2343 why = WHY_EXCEPTION;
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2344 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2345 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2346 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2347 if (x != NULL && kwdefaults > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2348 v = PyDict_New();
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2349 if (v == NULL) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2350 Py_DECREF(x);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2351 x = NULL;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2352 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2353 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2354 while (--kwdefaults >= 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2355 w = POP(); /* default value */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2356 u = POP(); /* kw only arg name */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2357 /* XXX(nnorwitz): check for errors */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2358 PyDict_SetItem(v, u, w);
40927 93f582803733 Fix a refleak in the MAKE_FUNCTION opcode in ceval.c. Georg Brandl <georg@python.org> parents: 40894 diff changeset	2359 Py_DECREF(w);
93f582803733 Fix a refleak in the MAKE_FUNCTION opcode in ceval.c. Georg Brandl <georg@python.org> parents: 40894 diff changeset	2360 Py_DECREF(u);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2361 }
50113 fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2362 if (PyFunction_SetKwDefaults(x, v) != 0) {
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2363 /* Can't happen unless
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2364 PyFunction_SetKwDefaults changes. */
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2365 why = WHY_EXCEPTION;
fb2456a36a83 Merged revisions 67697 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50105 diff changeset	2366 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2367 Py_DECREF(v);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2368 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2369 PUSH(x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2370 break;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2371 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2372
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2373 case BUILD_SLICE:
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2374 if (oparg == 3)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2375 w = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2376 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2377 w = NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2378 v = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2379 u = TOP();
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	2380 x = PySlice_New(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2381 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2382 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2383 Py_XDECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2384 SET_TOP(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	2385 if (x != NULL) continue;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2386 break;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2387
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2388 case EXTENDED_ARG:
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2389 opcode = NEXTOP();
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	2390 oparg = oparg<<16 \| NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2391 goto dispatch_opcode;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2392
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2393 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2394 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2395 "XXX lineno: %d, opcode: %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	2396 PyCode_Addr2Line(f->f_code, f->f_lasti),
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	2397 opcode);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2398 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	2399 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2400 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2401
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2402 #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	2403 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2404 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2405
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2406 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2407
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2408 on_error:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2409
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2410 READ_TIMESTAMP(inst1);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2411
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2412 /* Quickly continue if no error occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2413
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2414 if (why == WHY_NOT) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2415 if (err == 0 && x != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2416 #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	2417 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2418 if (PyErr_Occurred())
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2419 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2420 "XXX undetected error\n");
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2421 else {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2422 #endif
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2423 READ_TIMESTAMP(loop1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2424 continue; /* Normal, fast path */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2425 #ifdef CHECKEXC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2426 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2427 #endif
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2428 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2429 why = WHY_EXCEPTION;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2430 x = Py_None;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2431 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2432 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2433
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2434 /* Double-check exception status */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2435
31900 0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	2436 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2437 if (!PyErr_Occurred()) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2438 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	2439 "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	2440 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2441 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2442 }
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2443 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2444 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	2445 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2446 if (PyErr_Occurred()) {
45017 4725c84b0422 Merged revisions 60350-60363 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44905 diff changeset	2447 char buf[128];
30861 c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2448 sprintf(buf, "Stack unwind with exception "
c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2449 "set and why=%d", why);
c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2450 Py_FatalError(buf);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2451 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2452 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2453 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2454
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2455 /* 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	2456
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2457 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2458 PyTraceBack_Here(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2459
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2460 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	2461 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	2462 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	2463 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2464
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2465 /* 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	2466
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2467 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2468 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2469
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2470 /* Unwind stacks if a (pseudo) exception occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2471
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2472 fast_block_end:
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2473 while (why != WHY_NOT && f->f_iblock > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2474 PyTryBlock *b = PyFrame_BlockPop(f);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2475
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2476 assert(why != WHY_YIELD);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2477 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	2478 /* For a continue inside a try block,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2479 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	2480 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	2481 b->b_level);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2482 why = WHY_NOT;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	2483 JUMPTO(PyLong_AS_LONG(retval));
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2484 Py_DECREF(retval);
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2485 break;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2486 }
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2487
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2488 if (b->b_type == EXCEPT_HANDLER) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2489 UNWIND_EXCEPT_HANDLER(b);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2490 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2491 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2492 UNWIND_BLOCK(b);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2493 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	2494 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2495 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2496 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2497 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2498 if (why == WHY_EXCEPTION && (b->b_type == SETUP_EXCEPT
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2499 \|\| b->b_type == SETUP_FINALLY)) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2500 PyObject exc, val, *tb;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2501 int handler = b->b_handler;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2502 /* Beware, this invalidates all b->b_* fields */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2503 PyFrame_BlockSetup(f, EXCEPT_HANDLER, -1, STACK_LEVEL());
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2504 PUSH(tstate->exc_traceback);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2505 PUSH(tstate->exc_value);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2506 if (tstate->exc_type != NULL) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2507 PUSH(tstate->exc_type);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2508 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2509 else {
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2510 Py_INCREF(Py_None);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2511 PUSH(Py_None);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2512 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2513 PyErr_Fetch(&exc, &val, &tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2514 /* Make the raw exception data
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2515 available to the handler,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2516 so a program can emulate the
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2517 Python main loop. */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2518 PyErr_NormalizeException(
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2519 &exc, &val, &tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2520 PyException_SetTraceback(val, tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2521 Py_INCREF(exc);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2522 tstate->exc_type = exc;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2523 Py_INCREF(val);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2524 tstate->exc_value = val;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2525 tstate->exc_traceback = tb;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2526 if (tb == NULL)
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2527 tb = Py_None;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2528 Py_INCREF(tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2529 PUSH(tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2530 PUSH(val);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2531 PUSH(exc);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2532 why = WHY_NOT;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2533 JUMPTO(handler);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2534 break;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2535 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2536 if (b->b_type == SETUP_FINALLY) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2537 if (why & (WHY_RETURN \| WHY_CONTINUE))
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2538 PUSH(retval);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2539 PUSH(PyLong_FromLong((long)why));
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2540 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2541 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2542 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2543 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2544 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2545
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2546 /* 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	2547
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2548 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2549 break;
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2550 READ_TIMESTAMP(loop1);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2551
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2552 } /* main loop */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2553
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2554 assert(why != WHY_YIELD);
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2555 /* Pop remaining stack entries. */
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2556 while (!EMPTY()) {
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2557 v = POP();
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2558 Py_XDECREF(v);
21270 97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2559 }
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2560
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2561 if (why != WHY_RETURN)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2562 retval = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2563
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2564 fast_yield:
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2565 if (tstate->use_tracing) {
35345 700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2566 if (tstate->c_tracefunc) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2567 if (why == WHY_RETURN \|\| why == WHY_YIELD) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2568 if (call_trace(tstate->c_tracefunc,
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2569 tstate->c_traceobj, f,
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2570 PyTrace_RETURN, retval)) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2571 Py_XDECREF(retval);
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2572 retval = NULL;
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2573 why = WHY_EXCEPTION;
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2574 }
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2575 }
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2576 else if (why == WHY_EXCEPTION) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2577 call_trace_protected(tstate->c_tracefunc,
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2578 tstate->c_traceobj, f,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	2579 PyTrace_RETURN, NULL);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2580 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2581 }
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2582 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	2583 if (why == WHY_EXCEPTION)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2584 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	2585 tstate->c_profileobj, f,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	2586 PyTrace_RETURN, NULL);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2587 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	2588 tstate->c_profileobj, f,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2589 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	2590 Py_XDECREF(retval);
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2591 retval = NULL;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2592 why = WHY_EXCEPTION;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2593 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2594 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2595 }
5023 75c1ee882a4a Kill all local variables on function return. This closes a gigantic Guido van Rossum <guido@python.org> parents: 5021 diff changeset	2596
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	2597 /* pop frame */
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2598 exit_eval_frame:
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	2599 Py_LeaveRecursiveCall();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2600 tstate->frame = f->f_back;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2601
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2602 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2603 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2604
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2605 /* This is gonna seem real weird, but if you put some other code between
32421 485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure. Martin v. Löwis <martin@v.loewis.de> parents: 32412 diff changeset	2606 PyEval_EvalFrame() and PyEval_EvalCodeEx() you will need to adjust
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2607 the test in the if statements in Misc/gdbinit (pystack and pystackv). */
31606 fd2103ae6f29 Add pystack definition to Misc/gdbinit with some explanation of its behavior Skip Montanaro <skip@pobox.com> parents: 31514 diff changeset	2608
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	2609 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	2610 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	2611 PyObject args, int argcount, PyObject kws, int kwcount,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2612 PyObject *defs, int defcount, PyObject kwdefs, PyObject *closure)
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	2613 {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2614 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	2615 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	2616 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	2617 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	2618 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	2619
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2620 if (globals == NULL) {
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2621 PyErr_SetString(PyExc_SystemError,
19198 3c1c9948ff65 Remove much dead code from ceval.c Jeremy Hylton <jeremy@alum.mit.edu> parents: 19158 diff changeset	2622 "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	2623 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	2624 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2625
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	2626 assert(tstate != NULL);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2627 assert(globals != NULL);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2628 f = PyFrame_New(tstate, co, globals, 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	2629 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	2630 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	2631
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2632 fastlocals = f->f_localsplus;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2633 freevars = f->f_localsplus + co->co_nlocals;
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	2634
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2635 if (co->co_argcount > 0 \|\|
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2636 co->co_kwonlyargcount > 0 \|\|
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	2637 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	2638 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	2639 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	2640 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	2641 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	2642 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	2643 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	2644 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2645 i = co->co_argcount + co->co_kwonlyargcount;
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	2646 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	2647 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	2648 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	2649 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2650 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	2651 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	2652 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	2653 "%U() takes %s %d "
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2654 "%spositional argument%s (%d given)",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2655 co->co_name,
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	2656 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	2657 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	2658 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	2659 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	2660 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	2661 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	2662 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2663 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	2664 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2665 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	2666 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	2667 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	2668 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	2669 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2670 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	2671 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	2672 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	2673 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2674 SETLOCAL(co->co_argcount + co->co_kwonlyargcount, u);
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	2675 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	2676 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	2677 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	2678 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	2679 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2680 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2681 for (i = 0; i < kwcount; i++) {
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2682 PyObject **co_varnames;
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	2683 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	2684 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	2685 int j;
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2686 if (keyword == NULL \|\| !PyUnicode_Check(keyword)) {
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	2687 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	2688 "%U() keywords must be strings",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2689 co->co_name);
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	2690 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	2691 }
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2692 /* Speed hack: do raw pointer compares. As names are
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2693 normally interned this should almost always hit. */
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2694 co_varnames = PySequence_Fast_ITEMS(co->co_varnames);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2695 for (j = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2696 j < co->co_argcount + co->co_kwonlyargcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2697 j++) {
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2698 PyObject *nm = co_varnames[j];
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2699 if (nm == keyword)
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2700 goto kw_found;
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2701 }
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2702 /* Slow fallback, just in case */
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2703 for (j = 0;
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2704 j < co->co_argcount + co->co_kwonlyargcount;
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2705 j++) {
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2706 PyObject *nm = co_varnames[j];
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	2707 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	2708 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	2709 if (cmp > 0)
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2710 goto kw_found;
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	2711 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	2712 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	2713 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2714 /* 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	2715 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	2716 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2717 if (j >= co->co_argcount + co->co_kwonlyargcount) {
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	2718 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	2719 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	2720 "%U() got an unexpected "
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2721 "keyword argument '%S'",
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2722 co->co_name,
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2723 keyword);
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	2724 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	2725 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2726 PyDict_SetItem(kwdict, keyword, value);
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2727 continue;
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	2728 }
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2729 kw_found:
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2730 if (GETLOCAL(j) != NULL) {
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2731 PyErr_Format(PyExc_TypeError,
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2732 "%U() got multiple "
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2733 "values for keyword "
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2734 "argument '%S'",
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2735 co->co_name,
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2736 keyword);
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2737 goto fail;
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	2738 }
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2739 Py_INCREF(value);
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2740 SETLOCAL(j, 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	2741 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2742 if (co->co_kwonlyargcount > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2743 for (i = co->co_argcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2744 i < co->co_argcount + co->co_kwonlyargcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2745 i++) {
40381 259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	2746 PyObject name, def;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2747 if (GETLOCAL(i) != NULL)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2748 continue;
40381 259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	2749 name = PyTuple_GET_ITEM(co->co_varnames, i);
259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	2750 def = NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2751 if (kwdefs != NULL)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2752 def = PyDict_GetItem(kwdefs, name);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2753 if (def != NULL) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2754 Py_INCREF(def);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2755 SETLOCAL(i, def);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2756 continue;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2757 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2758 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	2759 "%U() needs keyword-only argument %S",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2760 co->co_name, name);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2761 goto fail;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2762 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2763 }
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	2764 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	2765 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	2766 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	2767 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	2768 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	2769 "%U() takes %s %d "
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2770 "%spositional argument%s "
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2771 "(%d given)",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2772 co->co_name,
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	2773 ((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	2774 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	2775 : "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	2776 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	2777 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	2778 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	2779 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2780 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2781 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	2782 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	2783 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	2784 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	2785 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	2786 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	2787 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	2788 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	2789 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	2790 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2791 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2792 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2793 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2794 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	2795 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	2796 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	2797 "%U() takes no arguments (%d given)",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	2798 co->co_name,
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	2799 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	2800 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	2801 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2802 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2803 /* 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	2804 vars into frame. This isn't too efficient right now. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2805 if (PyTuple_GET_SIZE(co->co_cellvars)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2806 int i, j, nargs, found;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2807 Py_UNICODE cellname, argname;
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	2808 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	2809
43996 b86e6bf7438f fix #1409: cell variables were not initialized, Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43840 diff changeset	2810 nargs = co->co_argcount + co->co_kwonlyargcount;
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	2811 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	2812 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	2813 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	2814 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	2815
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2816 /* Initialize each cell var, taking into account
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2817 cell vars that are initialized from arguments.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2818
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2819 Should arrange for the compiler to put cellvars
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2820 that are arguments at the beginning of the cellvars
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2821 list so that we can march over it more efficiently?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2822 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2823 for (i = 0; i < PyTuple_GET_SIZE(co->co_cellvars); ++i) {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2824 cellname = PyUnicode_AS_UNICODE(
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	2825 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	2826 found = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2827 for (j = 0; j < nargs; j++) {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2828 argname = PyUnicode_AS_UNICODE(
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	2829 PyTuple_GET_ITEM(co->co_varnames, j));
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2830 if (Py_UNICODE_strcmp(cellname, argname) == 0) {
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	2831 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	2832 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	2833 goto fail;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2834 GETLOCAL(co->co_nlocals + i) = c;
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	2835 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	2836 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	2837 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2838 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2839 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	2840 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	2841 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	2842 goto fail;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2843 SETLOCAL(co->co_nlocals + i, c);
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	2844 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2845 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2846 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2847 if (PyTuple_GET_SIZE(co->co_freevars)) {
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	2848 int i;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2849 for (i = 0; i < PyTuple_GET_SIZE(co->co_freevars); ++i) {
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	2850 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	2851 Py_INCREF(o);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2852 freevars[PyTuple_GET_SIZE(co->co_cellvars) + i] = o;
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	2853 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2854 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2855
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2856 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	2857 /* 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	2858 * 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	2859 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	2860 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	2861
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2862 PCALL(PCALL_GENERATOR);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2863
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2864 /* 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	2865 * and return that as the value. */
32175 8ee5a56b8031 Patch #957398: Add public API for Generator Object/Type. Martin v. Löwis <martin@v.loewis.de> parents: 31900 diff changeset	2866 return PyGen_New(f);
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	2867 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2868
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2869 retval = PyEval_EvalFrameEx(f,0);
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2870
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2871 fail: /* Jump here from prelude on failure */
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	2872
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2873 /* 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	2874 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	2875 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	2876 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	2877 */
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2878 assert(tstate != NULL);
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2879 ++tstate->recursion_depth;
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2880 Py_DECREF(f);
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2881 --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	2882 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	2883 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2884
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2885
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	2886 /* 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	2887 This consumes a reference count to each of its arguments. */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	2888 static enum why_code
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2889 do_raise(PyObject exc, PyObject cause)
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	2890 {
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	2891 PyObject type = NULL, value = NULL;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2892
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2893 if (exc == NULL) {
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2894 /* Reraise */
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	2895 PyThreadState *tstate = PyThreadState_GET();
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	2896 PyObject *tb;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2897 type = tstate->exc_type;
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2898 value = tstate->exc_value;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2899 tb = tstate->exc_traceback;
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2900 if (type == Py_None) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2901 PyErr_SetString(PyExc_RuntimeError,
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2902 "No active exception to reraise");
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2903 return WHY_EXCEPTION;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2904 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2905 Py_XINCREF(type);
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2906 Py_XINCREF(value);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2907 Py_XINCREF(tb);
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2908 PyErr_Restore(type, value, tb);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2909 return WHY_RERAISE;
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	2910 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2911
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	2912 /* We support the following forms of raise:
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2913 raise
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2914 raise <instance>
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2915 raise <type> */
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2916
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2917 if (PyExceptionClass_Check(exc)) {
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2918 type = exc;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2919 value = PyObject_CallObject(exc, NULL);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2920 if (value == NULL)
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2921 goto raise_error;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2922 }
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2923 else if (PyExceptionInstance_Check(exc)) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2924 value = exc;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2925 type = PyExceptionInstance_Class(exc);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2926 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	2927 }
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	2928 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	2929 /* 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	2930 anyway, just not what you specified :-) */
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2931 Py_DECREF(exc);
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	2932 PyErr_SetString(PyExc_TypeError,
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2933 "exceptions must derive from BaseException");
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	2934 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	2935 }
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2936
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2937 if (cause) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2938 PyObject *fixed_cause;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2939 if (PyExceptionClass_Check(cause)) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2940 fixed_cause = PyObject_CallObject(cause, NULL);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2941 if (fixed_cause == NULL)
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2942 goto raise_error;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2943 Py_DECREF(cause);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2944 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2945 else if (PyExceptionInstance_Check(cause)) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2946 fixed_cause = cause;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2947 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2948 else {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2949 PyErr_SetString(PyExc_TypeError,
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2950 "exception causes must derive from "
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2951 "BaseException");
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2952 goto raise_error;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2953 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2954 PyException_SetCause(value, fixed_cause);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	2955 }
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2956
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	2957 PyErr_SetObject(type, value);
7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	2958 /* PyErr_SetObject incref's its arguments */
7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	2959 Py_XDECREF(value);
7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	2960 Py_XDECREF(type);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2961 return WHY_EXCEPTION;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2962
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	2963 raise_error:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2964 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2965 Py_XDECREF(type);
43188 386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	2966 Py_XDECREF(cause);
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	2967 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	2968 }
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	2969
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2970 /* Iterate v argcnt times and store the results on the stack (via decreasing
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2971 sp). Return 1 for success, 0 if error.
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2972
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2973 If argcntafter == -1, do a simple unpack. If it is >= 0, do an unpack
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2974 with a variable target.
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2975 */
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2976
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2977 static int
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2978 unpack_iterable(PyObject v, int argcnt, int argcntafter, PyObject *sp)
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2979 {
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2980 int i = 0, j = 0;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2981 Py_ssize_t ll = 0;
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2982 PyObject it; / iter(v) */
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	2983 PyObject *w;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	2984 PyObject l = NULL; / variable list */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2985
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2986 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	2987
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2988 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	2989 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	2990 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	2991
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	2992 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	2993 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	2994 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	2995 /* 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	2996 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	2997 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	2998 "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	2999 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	3000 }
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3001 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3002 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3003 *--sp = w;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3004 }
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3005
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3006 if (argcntafter == -1) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3007 /* We better have exhausted the iterator now. */
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3008 w = PyIter_Next(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3009 if (w == NULL) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3010 if (PyErr_Occurred())
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3011 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3012 Py_DECREF(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3013 return 1;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3014 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3015 Py_DECREF(w);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3016 PyErr_SetString(PyExc_ValueError, "too many values to unpack");
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3017 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3018 }
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3019
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3020 l = PySequence_List(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3021 if (l == NULL)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3022 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3023 *--sp = l;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3024 i++;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3025
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3026 ll = PyList_GET_SIZE(l);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3027 if (ll < argcntafter) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3028 PyErr_Format(PyExc_ValueError, "need more than %zd values to unpack",
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3029 argcnt + ll);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3030 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3031 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3032
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3033 /* Pop the "after-variable" args off the list. */
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3034 for (j = argcntafter; j > 0; j--, i++) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3035 *--sp = PyList_GET_ITEM(l, ll - j);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3036 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3037 /* Resize the list. */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	3038 Py_SIZE(l) = ll - argcntafter;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3039 Py_DECREF(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3040 return 1;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3041
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3042 Error:
6160 79592761b331 unpack_sequence(): In finally clause, watch out for Py_DECREF Barry Warsaw <barry@python.org> parents: 6157 diff changeset	3043 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	3044 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	3045 Py_XDECREF(it);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3046 return 0;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3047 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3048
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3049
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3050 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3051 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3052 prtrace(PyObject v, char str)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3053 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3054 printf("%s ", str);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3055 if (PyObject_Print(v, stdout, 0) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3056 PyErr_Clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3057 printf("\n");
12579 978253542076 Add useless 'return 1' to prtrace() to shut up VC++. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3058 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3059 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3060 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3061
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3062 static void
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3063 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	3064 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3065 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	3066 int err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3067 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	3068 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3069 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3070 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	3071 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29669 diff changeset	3072 arg = PyTuple_Pack(3, 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	3073 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3074 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	3075 return;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3076 }
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3077 err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3078 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	3079 if (err == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3080 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	3081 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3082 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3083 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3084 Py_XDECREF(traceback);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3085 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3086 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3087
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3088 static int
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3089 call_trace_protected(Py_tracefunc func, PyObject obj, PyFrameObject frame,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3090 int what, PyObject *arg)
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3091 {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3092 PyObject type, value, *traceback;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3093 int err;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3094 PyErr_Fetch(&type, &value, &traceback);
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3095 err = call_trace(func, obj, frame, what, arg);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3096 if (err == 0)
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3097 {
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3098 PyErr_Restore(type, value, traceback);
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3099 return 0;
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3100 }
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3101 else {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3102 Py_XDECREF(type);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3103 Py_XDECREF(value);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3104 Py_XDECREF(traceback);
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3105 return -1;
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3106 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3107 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3108
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3109 static int
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3110 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	3111 int what, PyObject *arg)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3112 {
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3113 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	3114 int result;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3115 if (tstate->tracing)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3116 return 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3117 tstate->tracing++;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3118 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	3119 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	3120 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	3121 \|\| (tstate->c_profilefunc != NULL));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3122 tstate->tracing--;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3123 return result;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3124 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3125
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3126 PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3127 _PyEval_CallTracing(PyObject func, PyObject args)
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3128 {
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3129 PyFrameObject *frame = PyEval_GetFrame();
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3130 PyThreadState *tstate = frame->f_tstate;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3131 int save_tracing = tstate->tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3132 int save_use_tracing = tstate->use_tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3133 PyObject *result;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3134
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3135 tstate->tracing = 0;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3136 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3137 \|\| (tstate->c_profilefunc != NULL));
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3138 result = PyObject_Call(func, args, NULL);
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3139 tstate->tracing = save_tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3140 tstate->use_tracing = save_use_tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3141 return result;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3142 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3143
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3144 static int
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3145 maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3146 PyFrameObject frame, int instr_lb, int *instr_ub,
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3147 int *instr_prev)
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3148 {
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3149 int result = 0;
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3150
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3151 /* If the last instruction executed isn't in the current
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3152 instruction window, reset the window. If the last
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3153 instruction happens to fall at the start of a line or if it
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3154 represents a jump backwards, call the trace function.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3155 */
25078 be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24978 diff changeset	3156 if ((frame->f_lasti < instr_lb \|\| frame->f_lasti >= instr_ub)) {
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3157 int line;
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3158 PyAddrPair bounds;
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3159
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3160 line = PyCode_CheckLineNumber(frame->f_code, frame->f_lasti,
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3161 &bounds);
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3162 if (line >= 0) {
25207 1e46da1e6522 A slight change to SET_LINENO-less tracing. Michael W. Hudson <mwh@python.net> parents: 25109 diff changeset	3163 frame->f_lineno = line;
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3164 result = call_trace(func, obj, frame,
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3165 PyTrace_LINE, Py_None);
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3166 }
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3167 *instr_lb = bounds.ap_lower;
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3168 *instr_ub = bounds.ap_upper;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3169 }
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3170 else if (frame->f_lasti <= *instr_prev) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3171 result = call_trace(func, obj, frame, PyTrace_LINE, Py_None);
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3172 }
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3173 *instr_prev = frame->f_lasti;
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3174 return result;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3175 }
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3176
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3177 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3178 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	3179 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3180 PyThreadState *tstate = PyThreadState_GET();
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3181 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	3182 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3183 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	3184 tstate->c_profileobj = NULL;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3185 /* Must make sure that tracing is not ignored if 'temp' is freed */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3186 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	3187 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3188 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	3189 tstate->c_profileobj = arg;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3190 /* Flag that tracing or profiling is turned on */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3191 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	3192 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3193
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3194 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3195 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	3196 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3197 PyThreadState *tstate = PyThreadState_GET();
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3198 PyObject *temp = tstate->c_traceobj;
50133 33a1e1008e54 Unblocked and merged revisions 67611 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50113 diff changeset	3199 _Py_TracingPossible += (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	3200 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3201 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	3202 tstate->c_traceobj = NULL;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3203 /* Must make sure that profiling is not ignored if 'temp' is freed */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3204 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	3205 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3206 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	3207 tstate->c_traceobj = arg;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3208 /* Flag that tracing or profiling is turned on */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3209 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	3210 \|\| (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	3211 }
4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	3212
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3213 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3214 PyEval_GetBuiltins(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3215 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3216 PyFrameObject *current_frame = PyEval_GetFrame();
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3217 if (current_frame == NULL)
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3218 return PyThreadState_GET()->interp->builtins;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3219 else
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3220 return current_frame->f_builtins;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3221 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3222
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3223 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3224 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	3225 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3226 PyFrameObject *current_frame = PyEval_GetFrame();
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3227 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	3228 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3229 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	3230 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	3231 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3232
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3233 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3234 PyEval_GetGlobals(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3235 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3236 PyFrameObject *current_frame = PyEval_GetFrame();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3237 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3238 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3239 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3240 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3241 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3242
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3243 PyFrameObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3244 PyEval_GetFrame(void)
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3245 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3246 PyThreadState *tstate = PyThreadState_GET();
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3247 return _PyThreadState_GetFrame(tstate);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3248 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3249
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3250 int
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3251 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	3252 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3253 PyFrameObject *current_frame = PyEval_GetFrame();
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	3254 int result = cf->cf_flags != 0;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3255
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3256 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	3257 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	3258 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	3259 if (compilerflags) {
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3260 result = 1;
19350 5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	3261 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	3262 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3263 #if 0 /* future keyword */
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3264 if (codeflags & CO_GENERATOR_ALLOWED) {
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3265 result = 1;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3266 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	3267 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3268 #endif
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3269 }
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3270 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	3271 }
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	3272
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3273
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3274 /* External interface to call any callable object.
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3275 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	3276
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3277 #undef PyEval_CallObject
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3278 /* for backward compatibility: export this interface */
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3279
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3280 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3281 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	3282 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3283 return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3284 }
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3285 #define PyEval_CallObject(func,arg) \
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3286 PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3287
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3288 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3289 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	3290 {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3291 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3292
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3293 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3294 arg = PyTuple_New(0);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3295 if (arg == NULL)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3296 return NULL;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3297 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3298 else if (!PyTuple_Check(arg)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3299 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3300 "argument list must be a tuple");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3301 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3302 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3303 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3304 Py_INCREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3305
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3306 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	3307 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3308 "keyword list must be a dictionary");
12440 d47460b1a679 Charles Waldman writes: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	3309 Py_DECREF(arg);
2894 4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3310 return NULL;
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3311 }
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3312
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3313 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	3314 Py_DECREF(arg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3315 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3316 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3317
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3318 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3319 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	3320 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3321 if (PyMethod_Check(func))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3322 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	3323 else if (PyFunction_Check(func))
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	3324 return _PyUnicode_AsString(((PyFunctionObject*)func)->func_name);
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3325 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	3326 return ((PyCFunctionObject*)func)->m_ml->ml_name;
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3327 else
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3328 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	3329 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3330
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3331 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3332 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	3333 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3334 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	3335 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3336 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	3337 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3338 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	3339 return "()";
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3340 else
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3341 return " object";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3342 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3343
26141 6ce9228a3da2 Make private functions static so we don't pollute the namespace Neal Norwitz <nnorwitz@gmail.com> parents: 26110 diff changeset	3344 static void
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3345 err_args(PyObject *func, int flags, int nargs)
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3346 {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3347 if (flags & METH_NOARGS)
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3348 PyErr_Format(PyExc_TypeError,
24978 b1ab4e8d7d9c The error messages in err_args() -- which is only called when the Guido van Rossum <guido@python.org> parents: 24916 diff changeset	3349 "%.200s() takes no arguments (%d given)",
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3350 ((PyCFunctionObject *)func)->m_ml->ml_name,
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3351 nargs);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3352 else
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3353 PyErr_Format(PyExc_TypeError,
24978 b1ab4e8d7d9c The error messages in err_args() -- which is only called when the Guido van Rossum <guido@python.org> parents: 24916 diff changeset	3354 "%.200s() takes exactly one argument (%d given)",
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3355 ((PyCFunctionObject *)func)->m_ml->ml_name,
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3356 nargs);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3357 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3358
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3359 #define C_TRACE(x, call) \
32409 77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3360 if (tstate->use_tracing && tstate->c_profilefunc) { \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3361 if (call_trace(tstate->c_profilefunc, \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3362 tstate->c_profileobj, \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3363 tstate->frame, PyTrace_C_CALL, \
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3364 func)) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3365 x = NULL; \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3366 } \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3367 else { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3368 x = call; \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3369 if (tstate->c_profilefunc != NULL) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3370 if (x == NULL) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3371 call_trace_protected(tstate->c_profilefunc, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3372 tstate->c_profileobj, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3373 tstate->frame, PyTrace_C_EXCEPTION, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3374 func); \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3375 /* XXX should pass (type, value, tb) */ \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3376 } else { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3377 if (call_trace(tstate->c_profilefunc, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3378 tstate->c_profileobj, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3379 tstate->frame, PyTrace_C_RETURN, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3380 func)) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3381 Py_DECREF(x); \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3382 x = NULL; \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3383 } \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3384 } \
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3385 } \
32409 77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3386 } \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3387 } else { \
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3388 x = call; \
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3389 }
1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3390
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3391 static PyObject *
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3392 call_function(PyObject ***pp_stack, int oparg
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3393 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3394 , uint64* pintr0, uint64* pintr1
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3395 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3396 )
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3397 {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3398 int na = oparg & 0xff;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3399 int nk = (oparg>>8) & 0xff;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3400 int n = na + 2 * nk;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3401 PyObject *pfunc = (pp_stack) - n - 1;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3402 PyObject func = pfunc;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3403 PyObject x, w;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3404
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3405 /* Always dispatch PyCFunction first, because these are
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3406 presumed to be the most frequent callable object.
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3407 */
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3408 if (PyCFunction_Check(func) && nk == 0) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3409 int flags = PyCFunction_GET_FLAGS(func);
32412 393c15c0c5a4 Get ceval.c to compile again by moving declarations before other statments. Raymond Hettinger <python@rcn.com> parents: 32409 diff changeset	3410 PyThreadState *tstate = PyThreadState_GET();
393c15c0c5a4 Get ceval.c to compile again by moving declarations before other statments. Raymond Hettinger <python@rcn.com> parents: 32409 diff changeset	3411
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3412 PCALL(PCALL_CFUNCTION);
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3413 if (flags & (METH_NOARGS \| METH_O)) {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3414 PyCFunction meth = PyCFunction_GET_FUNCTION(func);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3415 PyObject *self = PyCFunction_GET_SELF(func);
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3416 if (flags & METH_NOARGS && na == 0) {
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3417 C_TRACE(x, (*meth)(self,NULL));
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3418 }
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3419 else if (flags & METH_O && na == 1) {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3420 PyObject arg = EXT_POP(pp_stack);
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3421 C_TRACE(x, (*meth)(self,arg));
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3422 Py_DECREF(arg);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3423 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3424 else {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3425 err_args(func, flags, na);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3426 x = NULL;
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3427 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3428 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3429 else {
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3430 PyObject *callargs;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3431 callargs = load_args(pp_stack, na);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3432 READ_TIMESTAMP(*pintr0);
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3433 C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3434 READ_TIMESTAMP(*pintr1);
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3435 Py_XDECREF(callargs);
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3436 }
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3437 } else {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3438 if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3439 /* optimize access to bound methods */
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3440 PyObject *self = PyMethod_GET_SELF(func);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3441 PCALL(PCALL_METHOD);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3442 PCALL(PCALL_BOUND_METHOD);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3443 Py_INCREF(self);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3444 func = PyMethod_GET_FUNCTION(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3445 Py_INCREF(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3446 Py_DECREF(*pfunc);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3447 *pfunc = self;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3448 na++;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3449 n++;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3450 } else
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3451 Py_INCREF(func);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3452 READ_TIMESTAMP(*pintr0);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3453 if (PyFunction_Check(func))
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3454 x = fast_function(func, pp_stack, n, na, nk);
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3455 else
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3456 x = do_call(func, pp_stack, na, nk);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3457 READ_TIMESTAMP(*pintr1);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3458 Py_DECREF(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3459 }
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3460
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3461 /* Clear the stack of the function object. Also removes
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3462 the arguments in case they weren't consumed already
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3463 (fast_function() and err_args() leave them on the stack).
36756 d0ca6302dd3c Put back the essence of Jeremy's original XXX comment. Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	3464 */
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3465 while ((*pp_stack) > pfunc) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3466 w = EXT_POP(*pp_stack);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3467 Py_DECREF(w);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3468 PCALL(PCALL_POP);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3469 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3470 return x;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3471 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3472
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3473 /* The fast_function() function optimize calls for which no argument
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3474 tuple is necessary; the objects are passed directly from the stack.
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3475 For the simplest case -- a function that takes only positional
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3476 arguments and is called with only positional arguments -- it
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3477 inlines the most primitive frame setup code from
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3478 PyEval_EvalCodeEx(), which vastly reduces the checks that must be
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3479 done before evaluating the frame.
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3480 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3481
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3482 static PyObject *
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3483 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	3484 {
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3485 PyCodeObject co = (PyCodeObject )PyFunction_GET_CODE(func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3486 PyObject *globals = PyFunction_GET_GLOBALS(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3487 PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3488 PyObject *kwdefs = PyFunction_GET_KW_DEFAULTS(func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3489 PyObject **d = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3490 int nd = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3491
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3492 PCALL(PCALL_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3493 PCALL(PCALL_FAST_FUNCTION);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3494 if (argdefs == NULL && co->co_argcount == n &&
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3495 co->co_kwonlyargcount == 0 && nk==0 &&
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3496 co->co_flags == (CO_OPTIMIZED \| CO_NEWLOCALS \| CO_NOFREE)) {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3497 PyFrameObject *f;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3498 PyObject *retval = NULL;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3499 PyThreadState *tstate = PyThreadState_GET();
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3500 PyObject fastlocals, stack;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3501 int i;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3502
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3503 PCALL(PCALL_FASTER_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3504 assert(globals != NULL);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3505 /* XXX Perhaps we should create a specialized
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3506 PyFrame_New() that doesn't take locals, but does
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3507 take builtins without sanity checking them.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3508 */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3509 assert(tstate != NULL);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3510 f = PyFrame_New(tstate, co, globals, NULL);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3511 if (f == NULL)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3512 return NULL;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3513
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3514 fastlocals = f->f_localsplus;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3515 stack = (*pp_stack) - n;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3516
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3517 for (i = 0; i < n; i++) {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3518 Py_INCREF(*stack);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3519 fastlocals[i] = *stack++;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3520 }
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	3521 retval = PyEval_EvalFrameEx(f,0);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3522 ++tstate->recursion_depth;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3523 Py_DECREF(f);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3524 --tstate->recursion_depth;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3525 return retval;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3526 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3527 if (argdefs != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3528 d = &PyTuple_GET_ITEM(argdefs, 0);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	3529 nd = Py_SIZE(argdefs);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3530 }
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3531 return PyEval_EvalCodeEx(co, globals,
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3532 (PyObject )NULL, (pp_stack)-n, na,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3533 (pp_stack)-2nk, nk, d, nd, kwdefs,
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3534 PyFunction_GET_CLOSURE(func));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3535 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3536
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3537 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	3538 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	3539 PyObject *func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3540 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3541 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3542 if (orig_kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3543 kwdict = PyDict_New();
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3544 else {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3545 kwdict = PyDict_Copy(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3546 Py_DECREF(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3547 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3548 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3549 return NULL;
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3550 while (--nk >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3551 int err;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3552 PyObject value = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3553 PyObject key = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3554 if (PyDict_GetItem(kwdict, key) != NULL) {
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3555 PyErr_Format(PyExc_TypeError,
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3556 "%.200s%s got multiple values "
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3557 "for keyword argument '%.200s'",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3558 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3559 PyEval_GetFuncDesc(func),
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	3560 _PyUnicode_AsString(key));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3561 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3562 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3563 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3564 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3565 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3566 err = PyDict_SetItem(kwdict, key, value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3567 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3568 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3569 if (err) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3570 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3571 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3572 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3573 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3574 return kwdict;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3575 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3576
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3577 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3578 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	3579 PyObject ***pp_stack)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3580 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3581 PyObject callargs, w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3582
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3583 callargs = PyTuple_New(nstack + nstar);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3584 if (callargs == NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3585 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3586 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3587 if (nstar) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3588 int i;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3589 for (i = 0; i < nstar; i++) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3590 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	3591 Py_INCREF(a);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3592 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	3593 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3594 }
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3595 while (--nstack >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3596 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3597 PyTuple_SET_ITEM(callargs, nstack, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3598 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3599 return callargs;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3600 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3601
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3602 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3603 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	3604 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3605 PyObject *args = PyTuple_New(na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3606 PyObject *w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3607
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3608 if (args == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3609 return NULL;
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3610 while (--na >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3611 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3612 PyTuple_SET_ITEM(args, na, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3613 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3614 return args;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3615 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3616
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3617 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3618 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	3619 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3620 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3621 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3622 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3623
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3624 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	3625 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	3626 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3627 goto call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3628 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3629 callargs = load_args(pp_stack, na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3630 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3631 goto call_fail;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3632 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3633 /* At this point, we have to look at the type of func to
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3634 update the call stats properly. Do it here so as to avoid
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3635 exposing the call stats machinery outside ceval.c
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3636 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3637 if (PyFunction_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3638 PCALL(PCALL_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3639 else if (PyMethod_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3640 PCALL(PCALL_METHOD);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3641 else if (PyType_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3642 PCALL(PCALL_TYPE);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3643 else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3644 PCALL(PCALL_OTHER);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3645 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3646 result = PyObject_Call(func, callargs, kwdict);
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3647 call_fail:
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3648 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3649 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3650 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3651 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3652
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3653 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3654 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	3655 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3656 int nstar = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3657 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3658 PyObject *stararg = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3659 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3660 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3661
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3662 if (flags & CALL_FLAG_KW) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3663 kwdict = EXT_POP(*pp_stack);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3664 if (!PyDict_Check(kwdict)) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3665 PyObject *d;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3666 d = PyDict_New();
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3667 if (d == NULL)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3668 goto ext_call_fail;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3669 if (PyDict_Update(d, kwdict) != 0) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3670 Py_DECREF(d);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3671 /* PyDict_Update raises attribute
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3672 * error (percolated from an attempt
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3673 * to get 'keys' attribute) instead of
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3674 * a type error if its second argument
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3675 * is not a mapping.
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3676 */
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3677 if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3678 PyErr_Format(PyExc_TypeError,
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3679 "%.200s%.200s argument after ** "
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3680 "must be a mapping, not %.200s",
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3681 PyEval_GetFuncName(func),
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3682 PyEval_GetFuncDesc(func),
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3683 kwdict->ob_type->tp_name);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3684 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3685 goto ext_call_fail;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3686 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3687 Py_DECREF(kwdict);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3688 kwdict = d;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3689 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3690 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3691 if (flags & CALL_FLAG_VAR) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3692 stararg = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3693 if (!PyTuple_Check(stararg)) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3694 PyObject *t = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3695 t = PySequence_Tuple(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3696 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	3697 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	3698 PyErr_Format(PyExc_TypeError,
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3699 "%.200s%.200s argument after * "
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3700 "must be a sequence, not %200s",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3701 PyEval_GetFuncName(func),
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3702 PyEval_GetFuncDesc(func),
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	3703 stararg->ob_type->tp_name);
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3704 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3705 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3706 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3707 Py_DECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3708 stararg = t;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3709 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3710 nstar = PyTuple_GET_SIZE(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3711 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3712 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	3713 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	3714 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3715 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3716 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3717 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	3718 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3719 goto ext_call_fail;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3720 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3721 /* At this point, we have to look at the type of func to
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3722 update the call stats properly. Do it here so as to avoid
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3723 exposing the call stats machinery outside ceval.c
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3724 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3725 if (PyFunction_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3726 PCALL(PCALL_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3727 else if (PyMethod_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3728 PCALL(PCALL_METHOD);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3729 else if (PyType_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3730 PCALL(PCALL_TYPE);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3731 else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3732 PCALL(PCALL_OTHER);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3733 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3734 result = PyObject_Call(func, callargs, kwdict);
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3735 ext_call_fail:
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3736 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3737 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3738 Py_XDECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3739 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3740 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3741
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3742 /* Extract a slice index from a PyInt or PyLong or an object with the
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3743 nb_index slot defined, and store in *pi.
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3744 Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX,
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3745 and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1.
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3746 Return 0 on error, 1 on success.
21440 30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3747 */
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3748 /* 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	3749 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	3750 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	3751 */
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3752 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	3753 _PyEval_SliceIndex(PyObject v, Py_ssize_t pi)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3754 {
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3755 if (v != NULL) {
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3756 Py_ssize_t x;
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44156 diff changeset	3757 if (PyIndex_Check(v)) {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3758 x = PyNumber_AsSsize_t(v, NULL);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3759 if (x == -1 && PyErr_Occurred())
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3760 return 0;
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3761 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3762 else {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3763 PyErr_SetString(PyExc_TypeError,
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3764 "slice indices must be integers or "
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3765 "None or have an __index__ method");
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3766 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3767 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3768 *pi = x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3769 }
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3770 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3771 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3772
42132 863ed7cd45dc Merged revisions 56020-56124 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3773 #define CANNOT_CATCH_MSG "catching classes that do not inherit from "\
40946 d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3774 "BaseException is not allowed"
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	3775
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3776 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3777 cmp_outcome(int op, register PyObject v, register PyObject w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3778 {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3779 int res = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3780 switch (op) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3781 case PyCmp_IS:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3782 res = (v == w);
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3783 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3784 case PyCmp_IS_NOT:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3785 res = (v != w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3786 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3787 case PyCmp_IN:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3788 res = PySequence_Contains(w, v);
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3789 if (res < 0)
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3790 return NULL;
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3791 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3792 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	3793 res = PySequence_Contains(w, v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3794 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3795 return NULL;
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3796 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3797 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3798 case PyCmp_EXC_MATCH:
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3799 if (PyTuple_Check(w)) {
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3800 Py_ssize_t i, length;
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3801 length = PyTuple_Size(w);
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3802 for (i = 0; i < length; i += 1) {
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3803 PyObject *exc = PyTuple_GET_ITEM(w, i);
40946 d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3804 if (!PyExceptionClass_Check(exc)) {
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3805 PyErr_SetString(PyExc_TypeError,
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3806 CANNOT_CATCH_MSG);
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	3807 return NULL;
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3808 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3809 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3810 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3811 else {
40946 d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3812 if (!PyExceptionClass_Check(w)) {
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3813 PyErr_SetString(PyExc_TypeError,
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3814 CANNOT_CATCH_MSG);
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	3815 return NULL;
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3816 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3817 }
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	3818 res = PyErr_GivenExceptionMatches(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3819 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3820 default:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3821 return PyObject_RichCompare(v, w, op);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3822 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3823 v = res ? Py_True : Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3824 Py_INCREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3825 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3826 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3827
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3828 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	3829 import_from(PyObject v, PyObject name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3830 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3831 PyObject *x;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3832
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3833 x = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3834 if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3835 PyErr_Format(PyExc_ImportError, "cannot import name %S", name);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3836 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3837 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	3838 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3839
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3840 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	3841 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	3842 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3843 PyObject *all = PyObject_GetAttrString(v, "__all__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3844 PyObject dict, name, *value;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3845 int skip_leading_underscores = 0;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3846 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	3847
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3848 if (all == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3849 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3850 return -1; /* Unexpected error */
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3851 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3852 dict = PyObject_GetAttrString(v, "__dict__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3853 if (dict == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3854 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3855 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3856 PyErr_SetString(PyExc_ImportError,
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3857 "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	3858 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3859 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3860 all = PyMapping_Keys(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3861 Py_DECREF(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3862 if (all == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3863 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3864 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	3865 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3866
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3867 for (pos = 0, err = 0; ; pos++) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3868 name = PySequence_GetItem(all, pos);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3869 if (name == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3870 if (!PyErr_ExceptionMatches(PyExc_IndexError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3871 err = -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3872 else
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3873 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3874 break;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3875 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3876 if (skip_leading_underscores &&
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	3877 PyUnicode_Check(name) &&
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	3878 PyUnicode_AS_UNICODE(name)[0] == '_')
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3879 {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3880 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3881 continue;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3882 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3883 value = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3884 if (value == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3885 err = -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	3886 else if (PyDict_CheckExact(locals))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	3887 err = PyDict_SetItem(locals, name, value);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3888 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	3889 err = PyObject_SetItem(locals, name, value);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3890 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3891 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	3892 if (err != 0)
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3893 break;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3894 }
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3895 Py_DECREF(all);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	3896 return err;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3897 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3898
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3899 static void
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	3900 format_exc_check_arg(PyObject exc, const char format_str, PyObject *obj)
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3901 {
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	3902 const char *obj_str;
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3903
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3904 if (!obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3905 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3906
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	3907 obj_str = _PyUnicode_AsString(obj);
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3908 if (!obj_str)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3909 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3910
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3911 PyErr_Format(exc, format_str, obj_str);
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	3912 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3913
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3914 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3915 unicode_concatenate(PyObject v, PyObject w,
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3916 PyFrameObject f, unsigned char next_instr)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3917 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3918 /* This function implements 'variable += expr' when both arguments
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3919 are (Unicode) strings. */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3920 Py_ssize_t v_len = PyUnicode_GET_SIZE(v);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3921 Py_ssize_t w_len = PyUnicode_GET_SIZE(w);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3922 Py_ssize_t new_len = v_len + w_len;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3923 if (new_len < 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3924 PyErr_SetString(PyExc_OverflowError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3925 "strings are too large to concat");
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3926 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3927 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3928
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3929 if (v->ob_refcnt == 2) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3930 /* In the common case, there are 2 references to the value
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3931 * stored in 'variable' when the += is performed: one on the
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3932 * value stack (in 'v') and one still stored in the
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3933 * 'variable'. We try to delete the variable now to reduce
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3934 * the refcnt to 1.
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3935 */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3936 switch (*next_instr) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3937 case STORE_FAST:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3938 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3939 int oparg = PEEKARG();
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3940 PyObject **fastlocals = f->f_localsplus;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3941 if (GETLOCAL(oparg) == v)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3942 SETLOCAL(oparg, NULL);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3943 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3944 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3945 case STORE_DEREF:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3946 {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3947 PyObject **freevars = (f->f_localsplus +
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3948 f->f_code->co_nlocals);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3949 PyObject *c = freevars[PEEKARG()];
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3950 if (PyCell_GET(c) == v)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3951 PyCell_Set(c, NULL);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3952 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3953 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3954 case STORE_NAME:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3955 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3956 PyObject *names = f->f_code->co_names;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3957 PyObject *name = GETITEM(names, PEEKARG());
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3958 PyObject *locals = f->f_locals;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3959 if (PyDict_CheckExact(locals) &&
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3960 PyDict_GetItem(locals, name) == v) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3961 if (PyDict_DelItem(locals, name) != 0) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3962 PyErr_Clear();
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3963 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3964 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3965 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3966 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3967 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3968 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3969
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3970 if (v->ob_refcnt == 1 && !PyUnicode_CHECK_INTERNED(v)) {
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3971 /* Now we own the last reference to 'v', so we can resize it
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3972 * in-place.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3973 */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3974 if (PyUnicode_Resize(&v, new_len) != 0) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3975 /* XXX if PyUnicode_Resize() fails, 'v' has been
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3976 * deallocated so it cannot be put back into
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3977 * 'variable'. The MemoryError is raised when there
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3978 * is no value in 'variable', which might (very
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	3979 * remotely) be a cause of incompatibilities.
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3980 */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3981 return NULL;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3982 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3983 /* copy 'w' into the newly allocated area of 'v' */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3984 memcpy(PyUnicode_AS_UNICODE(v) + v_len,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3985 PyUnicode_AS_UNICODE(w), w_len*sizeof(Py_UNICODE));
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3986 return v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3987 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3988 else {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3989 /* When in-place resizing is not an option. */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3990 w = PyUnicode_Concat(v, w);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3991 Py_DECREF(v);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	3992 return w;
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3993 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3994 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	3995
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3996 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	3997
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	3998 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3999 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	4000 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4001 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4002 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	4003 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	4004 for (i = 0; i < 256; i++) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	4005 PyObject *x = PyLong_FromLong(a[i]);
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4006 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4007 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4008 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4009 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4010 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	4011 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4012 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	4013 a[i] = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4014 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4015 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4016
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4017 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4018 _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	4019 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4020 #ifndef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4021 return getarray(dxp);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4022 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4023 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4024 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	4025 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	4026 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	4027 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	4028 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4029 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4030 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4031 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4032 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	4033 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4034 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4035 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4036 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4037
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4038 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 68249:4cd9f5e89061 3.0