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

annotate Python/ceval.c @ 67415:419ca089d365 2.7

Merged revisions 87796 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87796 | david.malcolm | 2011-01-06 12:01:36 -0500 (Thu, 06 Jan 2011) | 6 lines Issue #10655: Fix the build on PowerPC on Linux with GCC when building with timestamp profiling (--with-tsc): the preprocessor test for the PowerPC support now looks for "__powerpc__" as well as "__ppc__": the latter seems to only be present on OS X; the former is the correct one for Linux with GCC. ........

author	David Malcolm <dmalcolm@redhat.com>
date	Thu, 06 Jan 2011 17:39:24 +0000
parents	c9b08c58f063
children	b36cb4602e21

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
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	9 /* enable more aggressive intra-module optimizations, where available */
38350 3bef24086ace needforspeed: added PY_LOCAL_AGGRESSIVE macro to enable "aggressive" Fredrik Lundh <fredrik@pythonware.com> parents: 38345 diff changeset	10 #define PY_LOCAL_AGGRESSIVE
3bef24086ace needforspeed: added PY_LOCAL_AGGRESSIVE macro to enable "aggressive" Fredrik Lundh <fredrik@pythonware.com> parents: 38345 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
38418 708eaf0896bf Patch 1145039. Tim Peters <tim.peters@gmail.com> parents: 38352 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
67415 419ca089d365 Merged revisions 87796 via svnmerge from David Malcolm <dmalcolm@redhat.com> parents: 64936 diff changeset	30 /* PowerPC suppport.
419ca089d365 Merged revisions 87796 via svnmerge from David Malcolm <dmalcolm@redhat.com> parents: 64936 diff changeset	31 "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas
419ca089d365 Merged revisions 87796 via svnmerge from David Malcolm <dmalcolm@redhat.com> parents: 64936 diff changeset	32 "__powerpc__" appears to be the correct one for Linux with GCC
419ca089d365 Merged revisions 87796 via svnmerge from David Malcolm <dmalcolm@redhat.com> parents: 64936 diff changeset	33 */
419ca089d365 Merged revisions 87796 via svnmerge from David Malcolm <dmalcolm@redhat.com> parents: 64936 diff changeset	34 #if defined(__ppc__) \|\| defined (__powerpc__)
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	35
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	36 #define READ_TIMESTAMP(var) ppc_getcounter(&var)
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	37
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	38 static void
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	39 ppc_getcounter(uint64 *v)
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	40 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	41 register unsigned long tbu, tb, tbu2;
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	42
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	43 loop:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	44 asm volatile ("mftbu %0" : "=r" (tbu) );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	45 asm volatile ("mftb %0" : "=r" (tb) );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	46 asm volatile ("mftbu %0" : "=r" (tbu2));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	47 if (__builtin_expect(tbu != tbu2, 0)) goto loop;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	48
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	49 /* The slightly peculiar way of writing the next lines is
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	50 compiled better by GCC than any other way I tried. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	51 ((long*)(v))[0] = tbu;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	52 ((long*)(v))[1] = tb;
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	53 }
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	54
57002 f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	55 #elif defined(__i386__)
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	56
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	57 /* this is for linux/x86 (and probably any other GCC/x86 combo) */
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	58
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	59 #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	60 __asm__ __volatile__("rdtsc" : "=A" (val))
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	61
57002 f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	62 #elif defined(__x86_64__)
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	63
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	64 /* for gcc/x86_64, the "A" constraint in DI mode means either rax or rdx;
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	65 not edx:eax as it does for i386. Since rdtsc puts its result in edx:eax
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	66 even in 64-bit mode, we need to use "a" and "d" for the lower and upper
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	67 32-bit pieces of the result. */
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	68
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	69 #define READ_TIMESTAMP(val) \
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	70 __asm__ __volatile__("rdtsc" : \
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	71 "=a" (((int)&(val))[0]), "=d" (((int)&(val))[1]));
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	72
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	73
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	74 #else
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	75
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	76 #error "Don't know how to implement timestamp counter for this architecture"
f594313b9364 Issue #6603: Fix --with-tsc build failures on x86-64 that resulted Mark Dickinson <dickinsm@gmail.com> parents: 55034 diff changeset	77
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	78 #endif
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	79
38418 708eaf0896bf Patch 1145039. Tim Peters <tim.peters@gmail.com> parents: 38352 diff changeset	80 void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	81 uint64 loop0, uint64 loop1, uint64 intr0, uint64 intr1)
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	82 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	83 uint64 intr, inst, loop;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	84 PyThreadState *tstate = PyThreadState_Get();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	85 if (!tstate->interp->tscdump)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	86 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	87 intr = intr1 - intr0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	88 inst = inst1 - inst0 - intr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	89 loop = loop1 - loop0 - intr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	90 fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n",
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	91 opcode, ticked, inst, loop);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	92 }
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	93
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	94 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	95
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	96 /* 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	97 /* #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	98
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	99 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	100 /* For debugging the interpreter: */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	101 #define LLTRACE 1 /* Low-level trace feature */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	102 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	104
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	105 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	106
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	107 /* Forward declarations */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	108 #ifdef WITH_TSC
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	109 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	110 #else
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	111 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	112 #endif
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	113 static PyObject * fast_function(PyObject , PyObject **, int, int, int);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	114 static PyObject * do_call(PyObject , PyObject **, int, int);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	115 static PyObject * ext_do_call(PyObject , PyObject **, int, int, int);
43416 dc39dddea330 Try harder to stay within the 79-column limit. There's still two places that go (way) over, but those are harder to fix without suffering in readability. Thomas Wouters <thomas@python.org> parents: 43408 diff changeset	116 static PyObject * update_keyword_args(PyObject , int, PyObject **,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	117 PyObject *);
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	118 static PyObject * update_star_args(int, int, PyObject , PyObject **);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	119 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	120 #define CALL_FLAG_VAR 1
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	121 #define CALL_FLAG_KW 2
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	122
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	123 #ifdef LLTRACE
38352 9f7b1b7adf01 Py_LOCAL shouldn't be used for data; it works for some .NET 2003 compilers, Fredrik Lundh <fredrik@pythonware.com> parents: 38350 diff changeset	124 static int lltrace;
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	125 static int prtrace(PyObject , char );
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	126 #endif
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	127 static int call_trace(Py_tracefunc, PyObject , PyFrameObject ,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	128 int, PyObject *);
43845 76844a0a579f Merge from py3k branch: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43784 diff changeset	129 static int call_trace_protected(Py_tracefunc, PyObject *,
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	130 PyFrameObject , int, PyObject );
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	131 static void call_exc_trace(Py_tracefunc, PyObject , PyFrameObject );
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	132 static int maybe_call_line_trace(Py_tracefunc, PyObject *,
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	133 PyFrameObject , int , int , int );
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	134
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	135 static PyObject * apply_slice(PyObject , PyObject , PyObject *);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	136 static int assign_slice(PyObject , PyObject ,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	137 PyObject , PyObject );
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	138 static PyObject * cmp_outcome(int, PyObject , PyObject );
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	139 static PyObject * import_from(PyObject , PyObject );
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	140 static int import_all_from(PyObject , PyObject );
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	141 static PyObject * build_class(PyObject , PyObject , PyObject *);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	142 static int exec_statement(PyFrameObject *,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	143 PyObject , PyObject , PyObject *);
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	144 static void set_exc_info(PyThreadState , PyObject , PyObject , PyObject );
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	145 static void reset_exc_info(PyThreadState *);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	146 static void format_exc_check_arg(PyObject , char , PyObject *);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	147 static PyObject * string_concatenate(PyObject , PyObject ,
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	148 PyFrameObject , unsigned char );
50936 dbc14acdde37 allow unicode keyword arguments for the ** syntax #4978 Benjamin Peterson <benjamin@python.org> parents: 50674 diff changeset	149 static PyObject * kwd_as_string(PyObject *);
54329 145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 54297 diff changeset	150 static PyObject * special_lookup(PyObject , char , PyObject **);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	151
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	152 #define NAME_ERROR_MSG \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	153 "name '%.200s' is not defined"
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	154 #define GLOBAL_NAME_ERROR_MSG \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	155 "global name '%.200s' is not defined"
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	156 #define UNBOUNDLOCAL_ERROR_MSG \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	157 "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	158 #define UNBOUNDFREE_ERROR_MSG \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	159 "free variable '%.200s' referenced before assignment" \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	160 " in enclosing scope"
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	161
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	162 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	163 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	164 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	165 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	166 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	167 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	168 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	169 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	170 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	171
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	172 /* 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	173 #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	174 #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	175 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	176
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	177 #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	178 #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	179 #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	180 #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	181 #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	182 #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	183 #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	184 #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	185 #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	186 #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	187 #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	188
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	189 /* 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	190
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	191 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	192
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	193 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	194 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	195
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	196 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	197 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	198 twice.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	199
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	200 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	201 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	202 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	203 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	204 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	205 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	206
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	207 #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	208
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	209 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	210 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	211 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	212 return Py_BuildValue("iiiiiiiiiii",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	213 pcall[0], pcall[1], pcall[2], pcall[3],
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	214 pcall[4], pcall[5], pcall[6], pcall[7],
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	215 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	216 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	217 #else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	218 #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	219
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	220 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	221 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	222 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	223 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	224 return Py_None;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	225 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	226 #endif
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	227
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	228
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	229 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	230
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38536 diff changeset	231 #ifdef HAVE_ERRNO_H
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	232 #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	233 #endif
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9048 diff changeset	234 #include "pythread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	235
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	236 static PyThread_type_lock interpreter_lock = 0; /* This is the GIL */
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	237 static PyThread_type_lock pending_lock = 0; /* for pending calls */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	238 static long main_thread = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	239
33715 a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	240 int
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	241 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	242 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	243 return interpreter_lock != 0;
33715 a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	244 }
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	245
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	246 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	247 PyEval_InitThreads(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	248 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	249 if (interpreter_lock)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	250 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	251 interpreter_lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	252 PyThread_acquire_lock(interpreter_lock, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	253 main_thread = PyThread_get_thread_ident();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	254 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	255
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	256 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	257 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	258 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	259 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	260 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	261
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	262 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	263 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	264 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	265 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	266 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	267
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	268 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	269 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	270 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	271 if (tstate == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	272 Py_FatalError("PyEval_AcquireThread: NULL new thread state");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	273 /* Check someone has called PyEval_InitThreads() to create the lock */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	274 assert(interpreter_lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	275 PyThread_acquire_lock(interpreter_lock, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	276 if (PyThreadState_Swap(tstate) != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	277 Py_FatalError(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	278 "PyEval_AcquireThread: non-NULL old thread state");
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	279 }
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	280
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	281 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	282 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	283 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	284 if (tstate == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	285 Py_FatalError("PyEval_ReleaseThread: NULL thread state");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	286 if (PyThreadState_Swap(NULL) != tstate)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	287 Py_FatalError("PyEval_ReleaseThread: wrong thread state");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	288 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	289 }
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	290
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	291 /* 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	292 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	293 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	294 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	295
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	296 void
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	297 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	298 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	299 PyObject threading, result;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	300 PyThreadState *tstate;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	301
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	302 if (!interpreter_lock)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	303 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	304 /*XXX Can't use PyThread_free_lock here because it does too
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	305 much error-checking. Doing this cleanly would require
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	306 adding a new function to each thread_*.h. Instead, just
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	307 create a new lock and waste a little bit of memory */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	308 interpreter_lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	309 pending_lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	310 PyThread_acquire_lock(interpreter_lock, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	311 main_thread = PyThread_get_thread_ident();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	312
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	313 /* Update the threading module with the new state.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	314 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	315 tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	316 threading = PyMapping_GetItemString(tstate->interp->modules,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	317 "threading");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	318 if (threading == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	319 /* threading not imported */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	320 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	321 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	322 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	323 result = PyObject_CallMethod(threading, "_after_fork", NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	324 if (result == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	325 PyErr_WriteUnraisable(threading);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	326 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	327 Py_DECREF(result);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	328 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	329 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	330 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	331
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	332 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	333 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	334 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	335
5846 852a1fa62a7c PyEval_SaveThread() and PyEval_RestoreThread() now return/take a Guido van Rossum <guido@python.org> parents: 5829 diff changeset	336 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	337 PyEval_SaveThread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	338 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	339 PyThreadState *tstate = PyThreadState_Swap(NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	340 if (tstate == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	341 Py_FatalError("PyEval_SaveThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	342 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	343 if (interpreter_lock)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	344 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	345 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	346 return tstate;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	347 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	348
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	349 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	350 PyEval_RestoreThread(PyThreadState *tstate)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	351 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	352 if (tstate == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	353 Py_FatalError("PyEval_RestoreThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	354 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	355 if (interpreter_lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	356 int err = errno;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	357 PyThread_acquire_lock(interpreter_lock, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	358 errno = err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	359 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	360 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	361 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	362 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	363
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	364
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	365 /* 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	366 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	367 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	368 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	369 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	370 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	371
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	372 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	373 (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	374 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	375
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	376 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	377 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	378
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	379 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	380 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	381 will execute them.
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	382 There is no facility to schedule calls to a particular thread, but
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	383 that should be easy to change, should that ever be required. In
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	384 that case, the static variables here should go into the python
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	385 threadstate.
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	386 #endif
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	387 */
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	388
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	389 #ifdef WITH_THREAD
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	390
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	391 /* The WITH_THREAD implementation is thread-safe. It allows
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	392 scheduling to be made from any thread, and even from an executing
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	393 callback.
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	394 */
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	395
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	396 #define NPENDINGCALLS 32
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	397 static struct {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	398 int (func)(void );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	399 void *arg;
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	400 } pendingcalls[NPENDINGCALLS];
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	401 static int pendingfirst = 0;
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	402 static int pendinglast = 0;
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	403 static volatile int pendingcalls_to_do = 1; /* trigger initialization of lock */
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	404 static char pendingbusy = 0;
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	405
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	406 int
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	407 Py_AddPendingCall(int (func)(void ), void *arg)
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	408 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	409 int i, j, result=0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	410 PyThread_type_lock lock = pending_lock;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	411
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	412 /* try a few times for the lock. Since this mechanism is used
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	413 * for signal handling (on the main thread), there is a (slim)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	414 * chance that a signal is delivered on the same thread while we
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	415 * hold the lock during the Py_MakePendingCalls() function.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	416 * This avoids a deadlock in that case.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	417 * Note that signals can be delivered on any thread. In particular,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	418 * on Windows, a SIGINT is delivered on a system-created worker
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	419 * thread.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	420 * We also check for lock being NULL, in the unlikely case that
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	421 * this function is called before any bytecode evaluation takes place.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	422 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	423 if (lock != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	424 for (i = 0; i<100; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	425 if (PyThread_acquire_lock(lock, NOWAIT_LOCK))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	426 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	427 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	428 if (i == 100)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	429 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	430 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	431
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	432 i = pendinglast;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	433 j = (i + 1) % NPENDINGCALLS;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	434 if (j == pendingfirst) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	435 result = -1; /* Queue full */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	436 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	437 pendingcalls[i].func = func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	438 pendingcalls[i].arg = arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	439 pendinglast = j;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	440 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	441 /* signal main loop */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	442 _Py_Ticker = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	443 pendingcalls_to_do = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	444 if (lock != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	445 PyThread_release_lock(lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	446 return result;
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	447 }
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	448
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	449 int
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	450 Py_MakePendingCalls(void)
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	451 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	452 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	453 int r = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	454
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	455 if (!pending_lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	456 /* initial allocation of the lock */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	457 pending_lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	458 if (pending_lock == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	459 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	460 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	461
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	462 /* only service pending calls on main thread */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	463 if (main_thread && PyThread_get_thread_ident() != main_thread)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	464 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	465 /* don't perform recursive pending calls */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	466 if (pendingbusy)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	467 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	468 pendingbusy = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	469 /* perform a bounded number of calls, in case of recursion */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	470 for (i=0; i<NPENDINGCALLS; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	471 int j;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	472 int (func)(void );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	473 void *arg = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	474
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	475 /* pop one item off the queue while holding the lock */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	476 PyThread_acquire_lock(pending_lock, WAIT_LOCK);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	477 j = pendingfirst;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	478 if (j == pendinglast) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	479 func = NULL; /* Queue empty */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	480 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	481 func = pendingcalls[j].func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	482 arg = pendingcalls[j].arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	483 pendingfirst = (j + 1) % NPENDINGCALLS;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	484 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	485 pendingcalls_to_do = pendingfirst != pendinglast;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	486 PyThread_release_lock(pending_lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	487 /* having released the lock, perform the callback */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	488 if (func == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	489 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	490 r = func(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	491 if (r)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	492 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	493 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	494 pendingbusy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	495 return r;
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	496 }
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	497
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	498 #else /* if ! defined WITH_THREAD */
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	499
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	500 /*
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	501 WARNING! ASYNCHRONOUSLY EXECUTING CODE!
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	502 This code is used for signal handling in python that isn't built
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	503 with WITH_THREAD.
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	504 Don't use this implementation when Py_AddPendingCalls() can happen
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	505 on a different thread!
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	506
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	507 There are two possible race conditions:
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	508 (1) nested asynchronous calls to Py_AddPendingCall()
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	509 (2) AddPendingCall() calls made while pending calls are being processed.
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	510
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	511 (1) is very unlikely because typically signal delivery
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	512 is blocked during signal handling. So it should be impossible.
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	513 (2) is a real possibility.
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	514 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	515 The safety against (2) is derived from the fact that only one
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	516 thread is present, interrupted by signals, and that the critical
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	517 section is protected with the "busy" variable. On Windows, which
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	518 delivers SIGINT on a system thread, this does not hold and therefore
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	519 Windows really shouldn't use this version.
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	520 The two threads could theoretically wiggle around the "busy" variable.
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	521 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	522
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	523 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	524 static struct {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	525 int (func)(void );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	526 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	527 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	528 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	529 static volatile int pendinglast = 0;
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	530 static volatile int pendingcalls_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	531
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	532 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	533 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	534 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	535 static volatile int busy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	536 int i, j;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	537 /* XXX Begin critical section */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	538 if (busy)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	539 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	540 busy = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	541 i = pendinglast;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	542 j = (i + 1) % NPENDINGCALLS;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	543 if (j == pendingfirst) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	544 busy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	545 return -1; /* Queue full */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	546 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	547 pendingcalls[i].func = func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	548 pendingcalls[i].arg = arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	549 pendinglast = j;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	550
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	551 _Py_Ticker = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	552 pendingcalls_to_do = 1; /* Signal main loop */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	553 busy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	554 /* XXX End critical section */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	555 return 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	556 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	557
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	558 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	559 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	560 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	561 static int busy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	562 if (busy)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	563 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	564 busy = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	565 pendingcalls_to_do = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	566 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	567 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	568 int (func)(void );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	569 void *arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	570 i = pendingfirst;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	571 if (i == pendinglast)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	572 break; /* Queue empty */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	573 func = pendingcalls[i].func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	574 arg = pendingcalls[i].arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	575 pendingfirst = (i + 1) % NPENDINGCALLS;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	576 if (func(arg) < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	577 busy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	578 pendingcalls_to_do = 1; /* We're not done yet */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	579 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	580 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	581 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	582 busy = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	583 return 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	584 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	585
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	586 #endif /* WITH_THREAD */
c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	587
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	588
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	589 /* The interpreter's recursion limit */
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	590
34863 71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	591 #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	592 #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	593 #endif
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	594 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	595 int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	596
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	597 int
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	598 Py_GetRecursionLimit(void)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	599 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	600 return recursion_limit;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	601 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	602
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	603 void
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	604 Py_SetRecursionLimit(int new_limit)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	605 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	606 recursion_limit = new_limit;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	607 _Py_CheckRecursionLimit = recursion_limit;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	608 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	609
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	610 /* the macro Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall()
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	611 if the recursion_depth reaches _Py_CheckRecursionLimit.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	612 If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	613 to guarantee that _Py_CheckRecursiveCall() is regularly called.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	614 Without USE_STACKCHECK, there is no need for this. */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	615 int
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	616 _Py_CheckRecursiveCall(char *where)
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	617 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	618 PyThreadState *tstate = PyThreadState_GET();
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	619
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	620 #ifdef USE_STACKCHECK
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	621 if (PyOS_CheckStack()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	622 --tstate->recursion_depth;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	623 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	624 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	625 }
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	626 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	627 if (tstate->recursion_depth > recursion_limit) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	628 --tstate->recursion_depth;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	629 PyErr_Format(PyExc_RuntimeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	630 "maximum recursion depth exceeded%s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	631 where);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	632 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	633 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	634 _Py_CheckRecursionLimit = recursion_limit;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	635 return 0;
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	636 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	637
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	638 /* 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	639 enum why_code {
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	640 WHY_NOT = 0x0001, /* No error */
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	641 WHY_EXCEPTION = 0x0002, /* Exception occurred */
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	642 WHY_RERAISE = 0x0004, /* Exception re-raised by 'finally' */
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	643 WHY_RETURN = 0x0008, /* 'return' statement */
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	644 WHY_BREAK = 0x0010, /* 'break' statement */
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	645 WHY_CONTINUE = 0x0020, /* 'continue' statement */
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	646 WHY_YIELD = 0x0040 /* 'yield' operator */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	647 };
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	648
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	649 static enum why_code do_raise(PyObject , PyObject , PyObject *);
ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	650 static int unpack_iterable(PyObject , int, PyObject *);
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	651
49940 3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	652 /* Records whether tracing is on for any thread. Counts the number of
3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	653 threads for which tstate->c_tracefunc is non-NULL, so if the value
3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	654 is 0, we know we don't have to check this thread's c_tracefunc.
3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	655 This speeds up the if statement in PyEval_EvalFrameEx() after
3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	656 fast_next_opcode*/
3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	657 static int _Py_TracingPossible = 0;
3344804f327d Speed up Python (according to pybench and 2to3-on-itself) by 1-2% by caching Jeffrey Yasskin <jyasskin@gmail.com> parents: 48077 diff changeset	658
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	659 /* 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	660 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	661 int _Py_CheckInterval = 100;
50674 c8f793e159bb Issue 4293: Make Py_AddPendingCall() thread safe Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50204 diff changeset	662 volatile int _Py_Ticker = 0; /* so that we hit a "tick" first thing */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	663
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	664 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	665 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	666 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	667 return PyEval_EvalCodeEx(co,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	668 globals, locals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	669 (PyObject **)NULL, 0,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	670 (PyObject **)NULL, 0,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	671 (PyObject **)NULL, 0,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	672 NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	673 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	674
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	675
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	676 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	677
32421 485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure. Martin v. Löwis <martin@v.loewis.de> parents: 32412 diff changeset	678 PyObject *
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	679 PyEval_EvalFrame(PyFrameObject *f) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	680 /* This is for backward compatibility with extension modules that
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	681 used this API; core interpreter code should call
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	682 PyEval_EvalFrameEx() */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	683 return PyEval_EvalFrameEx(f, 0);
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	684 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	685
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	686 PyObject *
37597 2b2e9c388fbb low-hanging fruit in Python/ - g++ still hates all the enum_kind declarations Anthony Baxter <anthonybaxter@gmail.com> parents: 37564 diff changeset	687 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	688 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	689 #ifdef DXPAIRS
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	690 int lastopcode = 0;
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	691 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	692 register PyObject *stack_pointer; / Next free slot in value stack */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	693 register unsigned char *next_instr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	694 register int opcode; /* Current opcode */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	695 register int oparg; /* Current opcode argument, if any */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	696 register enum why_code why; /* Reason for block stack unwind */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	697 register int err; /* Error status -- nonzero if error */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	698 register PyObject x; / Result object -- NULL if error */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	699 register PyObject v; / Temporary objects popped off stack */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	700 register PyObject *w;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	701 register PyObject *u;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	702 register PyObject *t;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	703 register PyObject stream = NULL; / for PRINT opcodes */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	704 register PyObject fastlocals, freevars;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	705 PyObject retval = NULL; / Return value */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	706 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	707 PyCodeObject *co;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	708
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	709 /* when tracing we set things up so that
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	710
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	711 not (instr_lb <= current_bytecode_offset < instr_ub)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	712
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	713 is true when the line being executed has changed. The
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	714 initial values are such as to make this false the first
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	715 time it is tested. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	716 int instr_ub = -1, instr_lb = 0, instr_prev = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	717
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	718 unsigned char *first_instr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	719 PyObject *names;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	720 PyObject *consts;
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	721 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	722 /* Make it easier to find out where we are with a debugger */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	723 char *filename;
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	724 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	725
24232 e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	726 /* 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	727
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	728 #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	729 #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	730 #else
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	731 #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	732 #endif
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	733
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	734 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	735 /* 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	736 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	737 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	738 loop0 -- the top of the mainloop
38418 708eaf0896bf Patch 1145039. Tim Peters <tim.peters@gmail.com> parents: 38352 diff changeset	739 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	740 (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	741 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	742 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	743
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	744 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	745 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	746 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	747 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	748 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	749
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	750 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	751 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	752 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	753
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	754 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	755 cases:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	756
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	757 EXEC_STMT
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	758 IMPORT_STAR
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	759 IMPORT_FROM
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	760 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	761
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	762 */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	763 uint64 inst0, inst1, loop0, loop1, intr0 = 0, intr1 = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	764 int ticked = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	765
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	766 READ_TIMESTAMP(inst0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	767 READ_TIMESTAMP(inst1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	768 READ_TIMESTAMP(loop0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	769 READ_TIMESTAMP(loop1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	770
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	771 /* shut up the compiler */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	772 opcode = 0;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	773 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	774
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	775 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	776
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	777 #define INSTR_OFFSET() ((int)(next_instr - first_instr))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	778 #define NEXTOP() (*next_instr++)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	779 #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	780 #define PEEKARG() ((next_instr[2]<<8) + next_instr[1])
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	781 #define JUMPTO(x) (next_instr = first_instr + (x))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	782 #define JUMPBY(x) (next_instr += (x))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	783
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	784 /* OpCode prediction macros
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	785 Some opcodes tend to come in pairs thus making it possible to
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	786 predict the second code when the first is run. For example,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	787 GET_ITER is often followed by FOR_ITER. And FOR_ITER is often
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	788 followed by STORE_FAST or UNPACK_SEQUENCE.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	789
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	790 Verifying the prediction costs a single high-speed test of a register
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	791 variable against a constant. If the pairing was good, then the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	792 processor's own internal branch predication has a high likelihood of
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	793 success, resulting in a nearly zero-overhead transition to the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	794 next opcode. A successful prediction saves a trip through the eval-loop
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	795 including its two unpredictable branches, the HAS_ARG test and the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	796 switch-case. Combined with the processor's internal branch prediction,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	797 a successful PREDICT has the effect of making the two opcodes run as if
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	798 they were a single new opcode with the bodies combined.
47886 c93596ec1d3d Update comment on prediction macros. Raymond Hettinger <python@rcn.com> parents: 47868 diff changeset	799
c93596ec1d3d Update comment on prediction macros. Raymond Hettinger <python@rcn.com> parents: 47868 diff changeset	800 If collecting opcode statistics, your choices are to either keep the
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	801 predictions turned-on and interpret the results as if some opcodes
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	802 had been combined or turn-off predictions so that the opcode frequency
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	803 counter updates for both opcodes.
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	804 */
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	805
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	806 #ifdef DYNAMIC_EXECUTION_PROFILE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	807 #define PREDICT(op) if (0) goto PRED_##op
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	808 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	809 #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	810 #endif
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	811
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	812 #define PREDICTED(op) PRED_##op: next_instr++
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	813 #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	814
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	815 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	816
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	817 /* 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	818 co_stacksize are ints. */
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	819 #define STACK_LEVEL() ((int)(stack_pointer - f->f_valuestack))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	820 #define EMPTY() (STACK_LEVEL() == 0)
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	821 #define TOP() (stack_pointer[-1])
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	822 #define SECOND() (stack_pointer[-2])
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	823 #define THIRD() (stack_pointer[-3])
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	824 #define FOURTH() (stack_pointer[-4])
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	825 #define PEEK(n) (stack_pointer[-(n)])
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	826 #define SET_TOP(v) (stack_pointer[-1] = (v))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	827 #define SET_SECOND(v) (stack_pointer[-2] = (v))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	828 #define SET_THIRD(v) (stack_pointer[-3] = (v))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	829 #define SET_FOURTH(v) (stack_pointer[-4] = (v))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	830 #define SET_VALUE(n, v) (stack_pointer[-(n)] = (v))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	831 #define BASIC_STACKADJ(n) (stack_pointer += n)
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	832 #define BASIC_PUSH(v) (*stack_pointer++ = (v))
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	833 #define BASIC_POP() (*--stack_pointer)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	834
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	835 #ifdef LLTRACE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	836 #define PUSH(v) { (void)(BASIC_PUSH(v), \
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	837 lltrace && prtrace(TOP(), "push")); \
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	838 assert(STACK_LEVEL() <= co->co_stacksize); }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	839 #define POP() ((void)(lltrace && prtrace(TOP(), "pop")), \
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	840 BASIC_POP())
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	841 #define STACKADJ(n) { (void)(BASIC_STACKADJ(n), \
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	842 lltrace && prtrace(TOP(), "stackadj")); \
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	843 assert(STACK_LEVEL() <= co->co_stacksize); }
44292 44c418b2bf7f Silence a warning about an unsed variable in debug builds Christian Heimes <christian@cheimes.de> parents: 44164 diff changeset	844 #define EXT_POP(STACK_POINTER) ((void)(lltrace && \
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	845 prtrace((STACK_POINTER)[-1], "ext_pop")), \
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	846 *--(STACK_POINTER))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	847 #else
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	848 #define PUSH(v) BASIC_PUSH(v)
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	849 #define POP() BASIC_POP()
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	850 #define STACKADJ(n) BASIC_STACKADJ(n)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	851 #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	852 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	853
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	854 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	855
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	856 #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	857
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	858 /* 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	859 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	860 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	861 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	862 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	863 variable would be pointing to already-freed memory. */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	864 #define SETLOCAL(i, value) do { PyObject *tmp = GETLOCAL(i); \
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	865 GETLOCAL(i) = value; \
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	866 Py_XDECREF(tmp); } while (0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	867
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	868 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	869
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	870 if (f == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	871 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	872
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	873 /* push frame */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	874 if (Py_EnterRecursiveCall(""))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	875 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	876
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	877 tstate->frame = f;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	878
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	879 if (tstate->use_tracing) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	880 if (tstate->c_tracefunc != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	881 /* tstate->c_tracefunc, if defined, is a
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	882 function that will be called on every entry
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	883 to a code block. Its return value, if not
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	884 None, is a function that will be called at
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	885 the start of each executed line of code.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	886 (Actually, the function must return itself
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	887 in order to continue tracing.) The trace
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	888 functions are called with three arguments:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	889 a pointer to the current frame, a string
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	890 indicating why the function is called, and
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	891 an argument which depends on the situation.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	892 The global trace function is also called
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	893 whenever an exception is detected. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	894 if (call_trace_protected(tstate->c_tracefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	895 tstate->c_traceobj,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	896 f, PyTrace_CALL, Py_None)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	897 /* Trace function raised an error */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	898 goto exit_eval_frame;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	899 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	900 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	901 if (tstate->c_profilefunc != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	902 /* Similar for c_profilefunc, except it needn't
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	903 return itself and isn't called for "line" events */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	904 if (call_trace_protected(tstate->c_profilefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	905 tstate->c_profileobj,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	906 f, PyTrace_CALL, Py_None)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	907 /* Profile function raised an error */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	908 goto exit_eval_frame;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	909 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	910 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	911 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	912
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	913 co = f->f_code;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	914 names = co->co_names;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	915 consts = co->co_consts;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	916 fastlocals = f->f_localsplus;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	917 freevars = f->f_localsplus + co->co_nlocals;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	918 first_instr = (unsigned char*) PyString_AS_STRING(co->co_code);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	919 /* An explanation is in order for the next line.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	920
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	921 f->f_lasti now refers to the index of the last instruction
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	922 executed. You might think this was obvious from the name, but
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	923 this wasn't always true before 2.3! PyFrame_New now sets
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	924 f->f_lasti to -1 (i.e. the index before the first instruction)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	925 and YIELD_VALUE doesn't fiddle with f_lasti any more. So this
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	926 does work. Promise.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	927
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	928 When the PREDICT() macros are enabled, some opcode pairs follow in
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	929 direct succession without updating f->f_lasti. A successful
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	930 prediction effectively links the two codes together as if they
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	931 were a single new opcode; accordingly,f->f_lasti will point to
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	932 the first code in the pair (for instance, GET_ITER followed by
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	933 FOR_ITER is effectively a single opcode and f->f_lasti will point
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	934 at to the beginning of the combined pair.)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	935 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	936 next_instr = first_instr + f->f_lasti + 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	937 stack_pointer = f->f_stacktop;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	938 assert(stack_pointer != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	939 f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	940
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	941 #ifdef LLTRACE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	942 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	943 #endif
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	944 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	945 filename = PyString_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	946 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	947
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	948 why = WHY_NOT;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	949 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	950 x = Py_None; /* Not a reference, just anything non-NULL */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	951 w = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	952
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	953 if (throwflag) { /* support for generator.throw() */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	954 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	955 goto on_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	956 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	957
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	958 for (;;) {
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	959 #ifdef WITH_TSC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	960 if (inst1 == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	961 /* Almost surely, the opcode executed a break
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	962 or a continue, preventing inst1 from being set
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	963 on the way out of the loop.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	964 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	965 READ_TIMESTAMP(inst1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	966 loop1 = inst1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	967 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	968 dump_tsc(opcode, ticked, inst0, inst1, loop0, loop1,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	969 intr0, intr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	970 ticked = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	971 inst1 = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	972 intr0 = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	973 intr1 = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	974 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	975 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	976 assert(stack_pointer >= f->f_valuestack); /* else underflow */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	977 assert(STACK_LEVEL() <= co->co_stacksize); /* else overflow */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	978
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	979 /* Do periodic things. Doing this every time through
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	980 the loop would add too much overhead, so we do it
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	981 only every Nth instruction. We also do it if
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	982 ``pendingcalls_to_do'' is set, i.e. when an asynchronous
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	983 event needs attention (e.g. a signal handler or
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	984 async I/O handler); see Py_AddPendingCall() and
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	985 Py_MakePendingCalls() above. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	986
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	987 if (--_Py_Ticker < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	988 if (*next_instr == SETUP_FINALLY) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	989 /* Make the last opcode before
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	990 a try: finally: block uninterruptable. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	991 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	992 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	993 _Py_Ticker = _Py_CheckInterval;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	994 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	995 #ifdef WITH_TSC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	996 ticked = 1;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	997 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	998 if (pendingcalls_to_do) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	999 if (Py_MakePendingCalls() < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1000 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1001 goto on_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1002 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1003 if (pendingcalls_to_do)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1004 /* MakePendingCalls() didn't succeed.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1005 Force early re-execution of this
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1006 "periodic" code, possibly after
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1007 a thread switch */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1008 _Py_Ticker = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1009 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1010 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1011 if (interpreter_lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1012 /* Give another thread a chance */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1013
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1014 if (PyThreadState_Swap(NULL) != tstate)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1015 Py_FatalError("ceval: tstate mix-up");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1016 PyThread_release_lock(interpreter_lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1017
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1018 /* Other threads may run now */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1019
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1020 PyThread_acquire_lock(interpreter_lock, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1021 if (PyThreadState_Swap(tstate) != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1022 Py_FatalError("ceval: orphan tstate");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1023
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1024 /* Check for thread interrupts */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1025
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1026 if (tstate->async_exc != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1027 x = tstate->async_exc;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1028 tstate->async_exc = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1029 PyErr_SetNone(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1030 Py_DECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1031 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1032 goto on_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1033 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1034 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	1035 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1036 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1037
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1038 fast_next_opcode:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1039 f->f_lasti = INSTR_OFFSET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1040
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1041 /* line-by-line tracing support */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1042
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1043 if (_Py_TracingPossible &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1044 tstate->c_tracefunc != NULL && !tstate->tracing) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1045 /* see maybe_call_line_trace
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1046 for expository comments */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1047 f->f_stacktop = stack_pointer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1048
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1049 err = maybe_call_line_trace(tstate->c_tracefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1050 tstate->c_traceobj,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1051 f, &instr_lb, &instr_ub,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1052 &instr_prev);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1053 /* Reload possibly changed frame fields */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1054 JUMPTO(f->f_lasti);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1055 if (f->f_stacktop != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1056 stack_pointer = f->f_stacktop;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1057 f->f_stacktop = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1058 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1059 if (err) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1060 /* trace function raised an exception */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1061 goto on_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1062 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1063 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1064
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1065 /* Extract opcode and argument */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1066
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1067 opcode = NEXTOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1068 oparg = 0; /* allows oparg to be stored in a register because
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1069 it doesn't have to be remembered across a full loop */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1070 if (HAS_ARG(opcode))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1071 oparg = NEXTARG();
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1072 dispatch_opcode:
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1073 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1074 #ifdef DXPAIRS
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1075 dxpairs[lastopcode][opcode]++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1076 lastopcode = opcode;
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1077 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1078 dxp[opcode]++;
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1079 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1080
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1081 #ifdef LLTRACE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1082 /* Instruction tracing */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1083
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1084 if (lltrace) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1085 if (HAS_ARG(opcode)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1086 printf("%d: %d, %d\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1087 f->f_lasti, opcode, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1088 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1089 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1090 printf("%d: %d\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1091 f->f_lasti, opcode);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1092 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1093 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1094 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1095
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1096 /* Main switch on opcode */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1097 READ_TIMESTAMP(inst0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1098
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1099 switch (opcode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1100
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1101 /* BEWARE!
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1102 It is essential that any operation that fails sets either
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1103 x to NULL, err to nonzero, or why to anything but WHY_NOT,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1104 and that no operation that succeeds does this! */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1105
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1106 /* case STOP_CODE: this is an error! */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1107
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1108 case NOP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1109 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1110
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1111 case LOAD_FAST:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1112 x = GETLOCAL(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1113 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1114 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1115 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1116 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1117 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1118 format_exc_check_arg(PyExc_UnboundLocalError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1119 UNBOUNDLOCAL_ERROR_MSG,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1120 PyTuple_GetItem(co->co_varnames, oparg));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1121 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1122
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1123 case LOAD_CONST:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1124 x = GETITEM(consts, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1125 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1126 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1127 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1128
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1129 PREDICTED_WITH_ARG(STORE_FAST);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1130 case STORE_FAST:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1131 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1132 SETLOCAL(oparg, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1133 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1134
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1135 case POP_TOP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1136 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1137 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1138 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1139
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1140 case ROT_TWO:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1141 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1142 w = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1143 SET_TOP(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1144 SET_SECOND(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1145 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1146
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1147 case ROT_THREE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1148 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1149 w = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1150 x = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1151 SET_TOP(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1152 SET_SECOND(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1153 SET_THIRD(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1154 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1155
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1156 case ROT_FOUR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1157 u = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1158 v = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1159 w = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1160 x = FOURTH();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1161 SET_TOP(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1162 SET_SECOND(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1163 SET_THIRD(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1164 SET_FOURTH(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1165 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1166
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1167 case DUP_TOP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1168 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1169 Py_INCREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1170 PUSH(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1171 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1172
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1173 case DUP_TOPX:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1174 if (oparg == 2) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1175 x = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1176 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1177 w = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1178 Py_INCREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1179 STACKADJ(2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1180 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1181 SET_SECOND(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1182 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1183 } else if (oparg == 3) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1184 x = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1185 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1186 w = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1187 Py_INCREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1188 v = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1189 Py_INCREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1190 STACKADJ(3);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1191 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1192 SET_SECOND(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1193 SET_THIRD(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1194 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1195 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1196 Py_FatalError("invalid argument to DUP_TOPX"
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1197 " (bytecode corruption?)");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1198 /* Never returns, so don't bother to set why. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1199 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1200
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1201 case UNARY_POSITIVE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1202 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1203 x = PyNumber_Positive(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1204 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1205 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1206 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1207 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1208
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1209 case UNARY_NEGATIVE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1210 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1211 x = PyNumber_Negative(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1212 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1213 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1214 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1215 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1216
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1217 case UNARY_NOT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1218 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1219 err = PyObject_IsTrue(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1220 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1221 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1222 Py_INCREF(Py_True);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1223 SET_TOP(Py_True);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1224 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1225 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1226 else if (err > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1227 Py_INCREF(Py_False);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1228 SET_TOP(Py_False);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1229 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1230 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1231 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1232 STACKADJ(-1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1233 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1234
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1235 case UNARY_CONVERT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1236 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1237 x = PyObject_Repr(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1238 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1239 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1240 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1241 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1242
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1243 case UNARY_INVERT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1244 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1245 x = PyNumber_Invert(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1246 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1247 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1248 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1249 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1250
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1251 case BINARY_POWER:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1252 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1253 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1254 x = PyNumber_Power(v, w, Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1255 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1256 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1257 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1258 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1259 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1260
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1261 case BINARY_MULTIPLY:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1262 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1263 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1264 x = PyNumber_Multiply(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1265 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1266 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1267 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1268 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1269 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1270
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1271 case BINARY_DIVIDE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1272 if (!_Py_QnewFlag) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1273 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1274 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1275 x = PyNumber_Divide(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1276 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1277 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1278 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1279 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1280 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1281 }
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1282 /* -Qnew is in effect: fall through to
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1283 BINARY_TRUE_DIVIDE */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1284 case BINARY_TRUE_DIVIDE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1285 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1286 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1287 x = PyNumber_TrueDivide(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1288 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1289 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1290 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1291 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1292 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1293
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1294 case BINARY_FLOOR_DIVIDE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1295 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1296 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1297 x = PyNumber_FloorDivide(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1298 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1299 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1300 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1301 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1302 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1303
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1304 case BINARY_MODULO:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1305 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1306 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1307 if (PyString_CheckExact(v))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1308 x = PyString_Format(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1309 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1310 x = PyNumber_Remainder(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1311 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1312 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1313 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1314 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1315 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1316
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1317 case BINARY_ADD:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1318 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1319 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1320 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1321 /* INLINE: int + int */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1322 register long a, b, i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1323 a = PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1324 b = PyInt_AS_LONG(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1325 /* cast to avoid undefined behaviour
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1326 on overflow */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1327 i = (long)((unsigned long)a + b);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1328 if ((i^a) < 0 && (i^b) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1329 goto slow_add;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1330 x = PyInt_FromLong(i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1331 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1332 else if (PyString_CheckExact(v) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1333 PyString_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1334 x = string_concatenate(v, w, f, next_instr);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1335 /* string_concatenate consumed the ref to v */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1336 goto skip_decref_vx;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1337 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1338 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1339 slow_add:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1340 x = PyNumber_Add(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1341 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1342 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1343 skip_decref_vx:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1344 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1345 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1346 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1347 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1348
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1349 case BINARY_SUBTRACT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1350 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1351 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1352 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1353 /* INLINE: int - int */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1354 register long a, b, i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1355 a = PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1356 b = PyInt_AS_LONG(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1357 /* cast to avoid undefined behaviour
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1358 on overflow */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1359 i = (long)((unsigned long)a - b);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1360 if ((i^a) < 0 && (i^~b) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1361 goto slow_sub;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1362 x = PyInt_FromLong(i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1363 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1364 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1365 slow_sub:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1366 x = PyNumber_Subtract(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1367 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1368 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1369 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1370 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1371 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1372 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1373
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1374 case BINARY_SUBSCR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1375 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1376 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1377 if (PyList_CheckExact(v) && PyInt_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1378 /* INLINE: list[int] */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1379 Py_ssize_t i = PyInt_AsSsize_t(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1380 if (i < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1381 i += PyList_GET_SIZE(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1382 if (i >= 0 && i < PyList_GET_SIZE(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1383 x = PyList_GET_ITEM(v, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1384 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1385 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1386 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1387 goto slow_get;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1388 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1389 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1390 slow_get:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1391 x = PyObject_GetItem(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1392 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1393 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1394 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1395 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1396 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1397
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1398 case BINARY_LSHIFT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1399 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1400 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1401 x = PyNumber_Lshift(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1402 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1403 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1404 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1405 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1406 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1407
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1408 case BINARY_RSHIFT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1409 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1410 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1411 x = PyNumber_Rshift(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1412 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1413 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1414 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1415 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1416 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1417
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1418 case BINARY_AND:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1419 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1420 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1421 x = PyNumber_And(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1422 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1423 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1424 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1425 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1426 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1427
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1428 case BINARY_XOR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1429 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1430 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1431 x = PyNumber_Xor(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1432 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1433 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1434 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1435 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1436 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1437
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1438 case BINARY_OR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1439 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1440 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1441 x = PyNumber_Or(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1442 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1443 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1444 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1445 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1446 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1447
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1448 case LIST_APPEND:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1449 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1450 v = PEEK(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1451 err = PyList_Append(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1452 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1453 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1454 PREDICT(JUMP_ABSOLUTE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1455 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1456 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1457 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1458
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1459 case SET_ADD:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1460 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1461 v = stack_pointer[-oparg];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1462 err = PySet_Add(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1463 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1464 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1465 PREDICT(JUMP_ABSOLUTE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1466 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1467 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1468 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1469
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1470 case INPLACE_POWER:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1471 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1472 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1473 x = PyNumber_InPlacePower(v, w, Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1474 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1475 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1476 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1477 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1478 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1479
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1480 case INPLACE_MULTIPLY:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1481 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1482 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1483 x = PyNumber_InPlaceMultiply(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1484 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1485 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1486 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1487 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1488 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1489
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1490 case INPLACE_DIVIDE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1491 if (!_Py_QnewFlag) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1492 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1493 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1494 x = PyNumber_InPlaceDivide(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1495 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1496 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1497 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1498 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1499 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1500 }
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1501 /* -Qnew is in effect: fall through to
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1502 INPLACE_TRUE_DIVIDE */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1503 case INPLACE_TRUE_DIVIDE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1504 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1505 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1506 x = PyNumber_InPlaceTrueDivide(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1507 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1508 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1509 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1510 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1511 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1512
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1513 case INPLACE_FLOOR_DIVIDE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1514 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1515 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1516 x = PyNumber_InPlaceFloorDivide(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1517 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1518 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1519 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1520 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1521 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1522
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1523 case INPLACE_MODULO:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1524 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1525 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1526 x = PyNumber_InPlaceRemainder(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1527 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1528 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1529 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1530 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1531 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1532
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1533 case INPLACE_ADD:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1534 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1535 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1536 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1537 /* INLINE: int + int */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1538 register long a, b, i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1539 a = PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1540 b = PyInt_AS_LONG(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1541 i = a + b;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1542 if ((i^a) < 0 && (i^b) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1543 goto slow_iadd;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1544 x = PyInt_FromLong(i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1545 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1546 else if (PyString_CheckExact(v) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1547 PyString_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1548 x = string_concatenate(v, w, f, next_instr);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1549 /* string_concatenate consumed the ref to v */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1550 goto skip_decref_v;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1551 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1552 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1553 slow_iadd:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1554 x = PyNumber_InPlaceAdd(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1555 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1556 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1557 skip_decref_v:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1558 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1559 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1560 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1561 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1562
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1563 case INPLACE_SUBTRACT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1564 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1565 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1566 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1567 /* INLINE: int - int */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1568 register long a, b, i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1569 a = PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1570 b = PyInt_AS_LONG(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1571 i = a - b;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1572 if ((i^a) < 0 && (i^~b) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1573 goto slow_isub;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1574 x = PyInt_FromLong(i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1575 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1576 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1577 slow_isub:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1578 x = PyNumber_InPlaceSubtract(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1579 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1580 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1581 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1582 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1583 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1584 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1585
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1586 case INPLACE_LSHIFT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1587 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1588 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1589 x = PyNumber_InPlaceLshift(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1590 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1591 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1592 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1593 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1594 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1595
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1596 case INPLACE_RSHIFT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1597 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1598 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1599 x = PyNumber_InPlaceRshift(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1600 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1601 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1602 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1603 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1604 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1605
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1606 case INPLACE_AND:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1607 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1608 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1609 x = PyNumber_InPlaceAnd(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1610 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1611 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1612 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1613 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1614 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1615
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1616 case INPLACE_XOR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1617 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1618 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1619 x = PyNumber_InPlaceXor(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1620 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1621 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1622 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1623 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1624 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1625
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1626 case INPLACE_OR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1627 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1628 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1629 x = PyNumber_InPlaceOr(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1630 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1631 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1632 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1633 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1634 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1635
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1636 case SLICE+0:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1637 case SLICE+1:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1638 case SLICE+2:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1639 case SLICE+3:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1640 if ((opcode-SLICE) & 2)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1641 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1642 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1643 w = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1644 if ((opcode-SLICE) & 1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1645 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1646 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1647 v = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1648 u = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1649 x = apply_slice(u, v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1650 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1651 Py_XDECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1652 Py_XDECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1653 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1654 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1655 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1656
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1657 case STORE_SLICE+0:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1658 case STORE_SLICE+1:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1659 case STORE_SLICE+2:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1660 case STORE_SLICE+3:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1661 if ((opcode-STORE_SLICE) & 2)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1662 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1663 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1664 w = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1665 if ((opcode-STORE_SLICE) & 1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1666 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1667 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1668 v = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1669 u = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1670 t = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1671 err = assign_slice(u, v, w, t); /* u[v:w] = t */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1672 Py_DECREF(t);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1673 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1674 Py_XDECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1675 Py_XDECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1676 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1677 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1678
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1679 case DELETE_SLICE+0:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1680 case DELETE_SLICE+1:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1681 case DELETE_SLICE+2:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1682 case DELETE_SLICE+3:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1683 if ((opcode-DELETE_SLICE) & 2)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1684 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1685 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1686 w = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1687 if ((opcode-DELETE_SLICE) & 1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1688 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1689 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1690 v = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1691 u = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1692 err = assign_slice(u, v, w, (PyObject *)NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1693 /* del u[v:w] */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1694 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1695 Py_XDECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1696 Py_XDECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1697 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1698 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1699
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1700 case STORE_SUBSCR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1701 w = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1702 v = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1703 u = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1704 STACKADJ(-3);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1705 /* v[w] = u */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1706 err = PyObject_SetItem(v, w, u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1707 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1708 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1709 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1710 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1711 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1712
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1713 case DELETE_SUBSCR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1714 w = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1715 v = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1716 STACKADJ(-2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1717 /* del v[w] */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1718 err = PyObject_DelItem(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1719 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1720 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1721 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1722 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1723
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1724 case PRINT_EXPR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1725 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1726 w = PySys_GetObject("displayhook");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1727 if (w == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1728 PyErr_SetString(PyExc_RuntimeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1729 "lost sys.displayhook");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1730 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1731 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1732 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1733 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1734 x = PyTuple_Pack(1, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1735 if (x == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1736 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1737 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1738 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1739 w = PyEval_CallObject(w, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1740 Py_XDECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1741 if (w == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1742 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1743 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1744 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1745 Py_XDECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1746 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1747
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1748 case PRINT_ITEM_TO:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1749 w = stream = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1750 /* fall through to PRINT_ITEM */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1751
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1752 case PRINT_ITEM:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1753 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1754 if (stream == NULL \|\| stream == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1755 w = PySys_GetObject("stdout");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1756 if (w == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1757 PyErr_SetString(PyExc_RuntimeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1758 "lost sys.stdout");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1759 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1760 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1761 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1762 /* PyFile_SoftSpace() can exececute arbitrary code
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1763 if sys.stdout is an instance with a __getattr__.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1764 If __getattr__ raises an exception, w will
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1765 be freed, so we need to prevent that temporarily. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1766 Py_XINCREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1767 if (w != NULL && PyFile_SoftSpace(w, 0))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1768 err = PyFile_WriteString(" ", w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1769 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1770 err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1771 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1772 /* XXX move into writeobject() ? */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1773 if (PyString_Check(v)) {
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1774 char *s = PyString_AS_STRING(v);
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1775 Py_ssize_t len = PyString_GET_SIZE(v);
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1776 if (len == 0 \|\|
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1777 !isspace(Py_CHARMASK(s[len-1])) \|\|
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1778 s[len-1] == ' ')
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1779 PyFile_SoftSpace(w, 1);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1780 }
21475 aac23331a25d Patch #494384: Disable more Unicode API if Unicode is not used. Martin v. Löwis <martin@v.loewis.de> parents: 21441 diff changeset	1781 #ifdef Py_USING_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1782 else if (PyUnicode_Check(v)) {
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1783 Py_UNICODE *s = PyUnicode_AS_UNICODE(v);
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1784 Py_ssize_t len = PyUnicode_GET_SIZE(v);
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1785 if (len == 0 \|\|
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1786 !Py_UNICODE_ISSPACE(s[len-1]) \|\|
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1787 s[len-1] == ' ')
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1788 PyFile_SoftSpace(w, 1);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1789 }
23479 73249abed683 Fix for Michael W. Hudson <mwh@python.net> parents: 23156 diff changeset	1790 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1791 else
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	1792 PyFile_SoftSpace(w, 1);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1793 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1794 Py_XDECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1795 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1796 Py_XDECREF(stream);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1797 stream = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1798 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1799 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1800 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1801
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1802 case PRINT_NEWLINE_TO:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1803 w = stream = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1804 /* fall through to PRINT_NEWLINE */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1805
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1806 case PRINT_NEWLINE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1807 if (stream == NULL \|\| stream == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1808 w = PySys_GetObject("stdout");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1809 if (w == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1810 PyErr_SetString(PyExc_RuntimeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1811 "lost sys.stdout");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1812 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1813 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1814 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1815 if (w != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1816 /* w.write() may replace sys.stdout, so we
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1817 * have to keep our reference to it */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1818 Py_INCREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1819 err = PyFile_WriteString("\n", w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1820 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1821 PyFile_SoftSpace(w, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1822 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1823 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1824 Py_XDECREF(stream);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1825 stream = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1826 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1827
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1828
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1829 #ifdef CASE_TOO_BIG
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1830 default: switch (opcode) {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1831 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1832 case RAISE_VARARGS:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1833 u = v = w = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1834 switch (oparg) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1835 case 3:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1836 u = POP(); /* traceback */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1837 /* Fallthrough */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1838 case 2:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1839 v = POP(); /* value */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1840 /* Fallthrough */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1841 case 1:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1842 w = POP(); /* exc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1843 case 0: /* Fallthrough */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1844 why = do_raise(w, v, u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1845 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1846 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1847 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1848 "bad RAISE_VARARGS oparg");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1849 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1850 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1851 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1852 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1853
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1854 case LOAD_LOCALS:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1855 if ((x = f->f_locals) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1856 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1857 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1858 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1859 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1860 PyErr_SetString(PyExc_SystemError, "no locals");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1861 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1862
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1863 case RETURN_VALUE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1864 retval = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1865 why = WHY_RETURN;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1866 goto fast_block_end;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1867
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1868 case YIELD_VALUE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1869 retval = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1870 f->f_stacktop = stack_pointer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1871 why = WHY_YIELD;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1872 goto fast_yield;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1873
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1874 case EXEC_STMT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1875 w = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1876 v = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1877 u = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1878 STACKADJ(-3);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1879 READ_TIMESTAMP(intr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1880 err = exec_statement(f, u, v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1881 READ_TIMESTAMP(intr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1882 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1883 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1884 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1885 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1886
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1887 case POP_BLOCK:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1888 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1889 PyTryBlock *b = PyFrame_BlockPop(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1890 while (STACK_LEVEL() > b->b_level) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1891 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1892 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1893 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1894 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1895 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1896
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1897 PREDICTED(END_FINALLY);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1898 case END_FINALLY:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1899 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1900 if (PyInt_Check(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1901 why = (enum why_code) PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1902 assert(why != WHY_YIELD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1903 if (why == WHY_RETURN \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1904 why == WHY_CONTINUE)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1905 retval = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1906 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1907 else if (PyExceptionClass_Check(v) \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1908 PyString_Check(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1909 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1910 u = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1911 PyErr_Restore(v, w, u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1912 why = WHY_RERAISE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1913 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1914 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1915 else if (v != Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1916 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1917 "'finally' pops bad exception");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1918 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1919 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1920 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1921 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1922
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1923 case BUILD_CLASS:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1924 u = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1925 v = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1926 w = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1927 STACKADJ(-2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1928 x = build_class(u, v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1929 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1930 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1931 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1932 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1933 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1934
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1935 case STORE_NAME:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1936 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1937 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1938 if ((x = f->f_locals) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1939 if (PyDict_CheckExact(x))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1940 err = PyDict_SetItem(x, w, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1941 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1942 err = PyObject_SetItem(x, w, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1943 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1944 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1945 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1946 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1947 PyErr_Format(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1948 "no locals found when storing %s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1949 PyObject_REPR(w));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1950 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1951
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1952 case DELETE_NAME:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1953 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1954 if ((x = f->f_locals) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1955 if ((err = PyObject_DelItem(x, w)) != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1956 format_exc_check_arg(PyExc_NameError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1957 NAME_ERROR_MSG,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1958 w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1959 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1960 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1961 PyErr_Format(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1962 "no locals when deleting %s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1963 PyObject_REPR(w));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1964 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1965
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1966 PREDICTED_WITH_ARG(UNPACK_SEQUENCE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1967 case UNPACK_SEQUENCE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1968 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1969 if (PyTuple_CheckExact(v) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1970 PyTuple_GET_SIZE(v) == oparg) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1971 PyObject **items = \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1972 ((PyTupleObject *)v)->ob_item;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1973 while (oparg--) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1974 w = items[oparg];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1975 Py_INCREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1976 PUSH(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1977 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1978 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1979 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1980 } else if (PyList_CheckExact(v) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1981 PyList_GET_SIZE(v) == oparg) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1982 PyObject **items = \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1983 ((PyListObject *)v)->ob_item;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1984 while (oparg--) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1985 w = items[oparg];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1986 Py_INCREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1987 PUSH(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1988 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1989 } else if (unpack_iterable(v, oparg,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1990 stack_pointer + oparg)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1991 STACKADJ(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1992 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1993 /* unpack_iterable() raised an exception */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1994 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1995 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1996 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1997 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1998
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	1999 case STORE_ATTR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2000 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2001 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2002 u = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2003 STACKADJ(-2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2004 err = PyObject_SetAttr(v, w, u); /* v.w = u */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2005 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2006 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2007 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2008 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2009
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2010 case DELETE_ATTR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2011 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2012 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2013 err = PyObject_SetAttr(v, w, (PyObject *)NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2014 /* del v.w */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2015 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2016 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2017
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2018 case STORE_GLOBAL:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2019 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2020 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2021 err = PyDict_SetItem(f->f_globals, w, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2022 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2023 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2024 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2025
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2026 case DELETE_GLOBAL:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2027 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2028 if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2029 format_exc_check_arg(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2030 PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2031 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2032
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2033 case LOAD_NAME:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2034 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2035 if ((v = f->f_locals) == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2036 PyErr_Format(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2037 "no locals when loading %s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2038 PyObject_REPR(w));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2039 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2040 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2041 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2042 if (PyDict_CheckExact(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2043 x = PyDict_GetItem(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2044 Py_XINCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2045 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2046 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2047 x = PyObject_GetItem(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2048 if (x == NULL && PyErr_Occurred()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2049 if (!PyErr_ExceptionMatches(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2050 PyExc_KeyError))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2051 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2052 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2053 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2054 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2055 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2056 x = PyDict_GetItem(f->f_globals, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2057 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2058 x = PyDict_GetItem(f->f_builtins, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2059 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2060 format_exc_check_arg(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2061 PyExc_NameError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2062 NAME_ERROR_MSG, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2063 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2064 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2065 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2066 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2067 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2068 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2069 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2070
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2071 case LOAD_GLOBAL:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2072 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2073 if (PyString_CheckExact(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2074 /* Inline the PyDict_GetItem() calls.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2075 WARNING: this is an extreme speed hack.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2076 Do not try this at home. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2077 long hash = ((PyStringObject *)w)->ob_shash;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2078 if (hash != -1) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2079 PyDictObject *d;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2080 PyDictEntry *e;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2081 d = (PyDictObject *)(f->f_globals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2082 e = d->ma_lookup(d, w, hash);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2083 if (e == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2084 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2085 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2086 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2087 x = e->me_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2088 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2089 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2090 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2091 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2092 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2093 d = (PyDictObject *)(f->f_builtins);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2094 e = d->ma_lookup(d, w, hash);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2095 if (e == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2096 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2097 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2098 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2099 x = e->me_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2100 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2101 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2102 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2103 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2104 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2105 goto load_global_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2106 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2107 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2108 /* This is the un-inlined version of the code above */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2109 x = PyDict_GetItem(f->f_globals, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2110 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2111 x = PyDict_GetItem(f->f_builtins, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2112 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2113 load_global_error:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2114 format_exc_check_arg(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2115 PyExc_NameError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2116 GLOBAL_NAME_ERROR_MSG, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2117 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2118 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2119 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2120 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2121 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2122 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2123
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2124 case DELETE_FAST:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2125 x = GETLOCAL(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2126 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2127 SETLOCAL(oparg, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2128 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2129 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2130 format_exc_check_arg(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2131 PyExc_UnboundLocalError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2132 UNBOUNDLOCAL_ERROR_MSG,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2133 PyTuple_GetItem(co->co_varnames, oparg)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2134 );
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2135 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2136
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2137 case LOAD_CLOSURE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2138 x = freevars[oparg];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2139 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2140 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2141 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2142 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2143
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2144 case LOAD_DEREF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2145 x = freevars[oparg];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2146 w = PyCell_Get(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2147 if (w != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2148 PUSH(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2149 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2150 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2151 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2152 /* Don't stomp existing exception */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2153 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2154 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2155 if (oparg < PyTuple_GET_SIZE(co->co_cellvars)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2156 v = PyTuple_GET_ITEM(co->co_cellvars,
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	2157 oparg);
ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	2158 format_exc_check_arg(
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2159 PyExc_UnboundLocalError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2160 UNBOUNDLOCAL_ERROR_MSG,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2161 v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2162 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2163 v = PyTuple_GET_ITEM(co->co_freevars, oparg -
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2164 PyTuple_GET_SIZE(co->co_cellvars));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2165 format_exc_check_arg(PyExc_NameError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2166 UNBOUNDFREE_ERROR_MSG, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2167 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2168 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2169
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2170 case STORE_DEREF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2171 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2172 x = freevars[oparg];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2173 PyCell_Set(x, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2174 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2175 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2176
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2177 case BUILD_TUPLE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2178 x = PyTuple_New(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2179 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2180 for (; --oparg >= 0;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2181 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2182 PyTuple_SET_ITEM(x, oparg, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2183 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2184 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2185 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2186 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2187 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2188
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2189 case BUILD_LIST:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2190 x = PyList_New(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2191 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2192 for (; --oparg >= 0;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2193 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2194 PyList_SET_ITEM(x, oparg, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2195 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2196 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2197 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2198 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2199 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2200
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2201 case BUILD_SET:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2202 x = PySet_New(NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2203 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2204 for (; --oparg >= 0;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2205 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2206 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2207 err = PySet_Add(x, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2208 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2209 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2210 if (err != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2211 Py_DECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2212 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2213 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2214 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2215 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2216 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2217 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2218
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2219
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2220 case BUILD_MAP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2221 x = _PyDict_NewPresized((Py_ssize_t)oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2222 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2223 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2224 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2225
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2226 case STORE_MAP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2227 w = TOP(); /* key */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2228 u = SECOND(); /* value */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2229 v = THIRD(); /* dict */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2230 STACKADJ(-2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2231 assert (PyDict_CheckExact(v));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2232 err = PyDict_SetItem(v, w, u); /* v[w] = u */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2233 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2234 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2235 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2236 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2237
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2238 case MAP_ADD:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2239 w = TOP(); /* key */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2240 u = SECOND(); /* value */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2241 STACKADJ(-2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2242 v = stack_pointer[-oparg]; /* dict */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2243 assert (PyDict_CheckExact(v));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2244 err = PyDict_SetItem(v, w, u); /* v[w] = u */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2245 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2246 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2247 if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2248 PREDICT(JUMP_ABSOLUTE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2249 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2250 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2251 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2252
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2253 case LOAD_ATTR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2254 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2255 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2256 x = PyObject_GetAttr(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2257 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2258 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2259 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2260 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2261
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2262 case COMPARE_OP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2263 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2264 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2265 if (PyInt_CheckExact(w) && PyInt_CheckExact(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2266 /* INLINE: cmp(int, int) */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2267 register long a, b;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2268 register int res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2269 a = PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2270 b = PyInt_AS_LONG(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2271 switch (oparg) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2272 case PyCmp_LT: res = a < b; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2273 case PyCmp_LE: res = a <= b; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2274 case PyCmp_EQ: res = a == b; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2275 case PyCmp_NE: res = a != b; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2276 case PyCmp_GT: res = a > b; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2277 case PyCmp_GE: res = a >= b; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2278 case PyCmp_IS: res = v == w; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2279 case PyCmp_IS_NOT: res = v != w; break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2280 default: goto slow_compare;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2281 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2282 x = res ? Py_True : Py_False;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2283 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2284 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2285 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2286 slow_compare:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2287 x = cmp_outcome(oparg, v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2288 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2289 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2290 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2291 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2292 if (x == NULL) break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2293 PREDICT(POP_JUMP_IF_FALSE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2294 PREDICT(POP_JUMP_IF_TRUE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2295 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2296
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2297 case IMPORT_NAME:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2298 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2299 x = PyDict_GetItemString(f->f_builtins, "__import__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2300 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2301 PyErr_SetString(PyExc_ImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2302 "__import__ not found");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2303 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2304 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2305 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2306 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2307 u = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2308 if (PyInt_AsLong(u) != -1 \|\| PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2309 w = PyTuple_Pack(5,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2310 w,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2311 f->f_globals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2312 f->f_locals == NULL ?
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2313 Py_None : f->f_locals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2314 v,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2315 u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2316 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2317 w = PyTuple_Pack(4,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2318 w,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2319 f->f_globals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2320 f->f_locals == NULL ?
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2321 Py_None : f->f_locals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2322 v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2323 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2324 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2325 if (w == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2326 u = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2327 Py_DECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2328 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2329 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2330 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2331 READ_TIMESTAMP(intr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2332 v = x;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2333 x = PyEval_CallObject(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2334 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2335 READ_TIMESTAMP(intr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2336 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2337 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2338 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2339 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2340
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2341 case IMPORT_STAR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2342 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2343 PyFrame_FastToLocals(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2344 if ((x = f->f_locals) == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2345 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2346 "no locals found during 'import *'");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2347 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2348 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2349 READ_TIMESTAMP(intr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2350 err = import_all_from(x, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2351 READ_TIMESTAMP(intr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2352 PyFrame_LocalsToFast(f, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2353 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2354 if (err == 0) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2355 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2356
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2357 case IMPORT_FROM:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2358 w = GETITEM(names, oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2359 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2360 READ_TIMESTAMP(intr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2361 x = import_from(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2362 READ_TIMESTAMP(intr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2363 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2364 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2365 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2366
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2367 case JUMP_FORWARD:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2368 JUMPBY(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2369 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2370
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2371 PREDICTED_WITH_ARG(POP_JUMP_IF_FALSE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2372 case POP_JUMP_IF_FALSE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2373 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2374 if (w == Py_True) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2375 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2376 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2377 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2378 if (w == Py_False) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2379 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2380 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2381 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2382 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2383 err = PyObject_IsTrue(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2384 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2385 if (err > 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2386 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2387 else if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2388 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2389 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2390 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2391 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2392
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2393 PREDICTED_WITH_ARG(POP_JUMP_IF_TRUE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2394 case POP_JUMP_IF_TRUE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2395 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2396 if (w == Py_False) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2397 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2398 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2399 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2400 if (w == Py_True) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2401 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2402 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2403 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2404 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2405 err = PyObject_IsTrue(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2406 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2407 if (err > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2408 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2409 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2410 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2411 else if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2412 ;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2413 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2414 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2415 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2416
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2417 case JUMP_IF_FALSE_OR_POP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2418 w = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2419 if (w == Py_True) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2420 STACKADJ(-1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2421 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2422 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2423 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2424 if (w == Py_False) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2425 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2426 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2427 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2428 err = PyObject_IsTrue(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2429 if (err > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2430 STACKADJ(-1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2431 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2432 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2433 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2434 else if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2435 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2436 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2437 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2438 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2439
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2440 case JUMP_IF_TRUE_OR_POP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2441 w = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2442 if (w == Py_False) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2443 STACKADJ(-1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2444 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2445 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2446 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2447 if (w == Py_True) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2448 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2449 goto fast_next_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2450 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2451 err = PyObject_IsTrue(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2452 if (err > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2453 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2454 JUMPTO(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2455 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2456 else if (err == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2457 STACKADJ(-1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2458 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2459 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2460 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2461 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2462 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2463
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2464 PREDICTED_WITH_ARG(JUMP_ABSOLUTE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2465 case JUMP_ABSOLUTE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2466 JUMPTO(oparg);
43784 8fcc3f46c69d Add build option for faster loop execution. Raymond Hettinger <python@rcn.com> parents: 43416 diff changeset	2467 #if FAST_LOOPS
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2468 /* Enabling this path speeds-up all while and for-loops by bypassing
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2469 the per-loop checks for signals. By default, this should be turned-off
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2470 because it prevents detection of a control-break in tight loops like
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2471 "while 1: pass". Compile with this option turned-on when you need
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2472 the speed-up and do not need break checking inside tight loops (ones
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2473 that contain only instructions ending with goto fast_next_opcode).
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2474 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2475 goto fast_next_opcode;
43784 8fcc3f46c69d Add build option for faster loop execution. Raymond Hettinger <python@rcn.com> parents: 43416 diff changeset	2476 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2477 continue;
43784 8fcc3f46c69d Add build option for faster loop execution. Raymond Hettinger <python@rcn.com> parents: 43416 diff changeset	2478 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2479
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2480 case GET_ITER:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2481 /* before: [obj]; after [getiter(obj)] */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2482 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2483 x = PyObject_GetIter(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2484 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2485 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2486 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2487 PREDICT(FOR_ITER);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2488 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2489 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2490 STACKADJ(-1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2491 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2492
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2493 PREDICTED_WITH_ARG(FOR_ITER);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2494 case FOR_ITER:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2495 /* before: [iter]; after: [iter, iter()] or [] */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2496 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2497 x = (*v->ob_type->tp_iternext)(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2498 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2499 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2500 PREDICT(STORE_FAST);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2501 PREDICT(UNPACK_SEQUENCE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2502 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2503 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2504 if (PyErr_Occurred()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2505 if (!PyErr_ExceptionMatches(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2506 PyExc_StopIteration))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2507 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2508 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2509 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2510 /* iterator ended normally */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2511 x = v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2512 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2513 JUMPBY(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2514 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2515
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2516 case BREAK_LOOP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2517 why = WHY_BREAK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2518 goto fast_block_end;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2519
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2520 case CONTINUE_LOOP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2521 retval = PyInt_FromLong(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2522 if (!retval) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2523 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2524 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2525 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2526 why = WHY_CONTINUE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2527 goto fast_block_end;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2528
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2529 case SETUP_LOOP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2530 case SETUP_EXCEPT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2531 case SETUP_FINALLY:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2532 /* NOTE: If you add any new block-setup opcodes that
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2533 are not try/except/finally handlers, you may need
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2534 to update the PyGen_NeedsFinalizing() function.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2535 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2536
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2537 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2538 STACK_LEVEL());
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2539 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2540
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2541 case SETUP_WITH:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2542 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2543 static PyObject exit, enter;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2544 w = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2545 x = special_lookup(w, "__exit__", &exit);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2546 if (!x)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2547 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2548 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2549 u = special_lookup(w, "__enter__", &enter);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2550 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2551 if (!u) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2552 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2553 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2554 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2555 x = PyObject_CallFunctionObjArgs(u, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2556 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2557 if (!x)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2558 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2559 /* Setup a finally block (SETUP_WITH as a block is
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2560 equivalent to SETUP_FINALLY except it normalizes
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2561 the exception) before pushing the result of
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2562 __enter__ on the stack. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2563 PyFrame_BlockSetup(f, SETUP_WITH, INSTR_OFFSET() + oparg,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2564 STACK_LEVEL());
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2565
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2566 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2567 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2568 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2569
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2570 case WITH_CLEANUP:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2571 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2572 /* At the top of the stack are 1-3 values indicating
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2573 how/why we entered the finally clause:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2574 - TOP = None
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2575 - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2576 - TOP = WHY_*; no retval below it
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2577 - (TOP, SECOND, THIRD) = exc_info()
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2578 Below them is EXIT, the context.__exit__ bound method.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2579 In the last case, we must call
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2580 EXIT(TOP, SECOND, THIRD)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2581 otherwise we must call
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2582 EXIT(None, None, None)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2583
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2584 In all cases, we remove EXIT from the stack, leaving
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2585 the rest in the same order.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2586
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2587 In addition, if the stack represents an exception,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2588 and the function call returns a 'true' value, we
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2589 "zap" this information, to prevent END_FINALLY from
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2590 re-raising the exception. (But non-local gotos
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2591 should still be resumed.)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2592 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2593
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2594 PyObject *exit_func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2595
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2596 u = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2597 if (u == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2598 exit_func = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2599 SET_TOP(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2600 v = w = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2601 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2602 else if (PyInt_Check(u)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2603 switch(PyInt_AS_LONG(u)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2604 case WHY_RETURN:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2605 case WHY_CONTINUE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2606 /* Retval in TOP. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2607 exit_func = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2608 SET_SECOND(TOP());
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2609 SET_TOP(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2610 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2611 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2612 exit_func = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2613 SET_TOP(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2614 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2615 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2616 u = v = w = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2617 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2618 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2619 v = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2620 w = SECOND();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2621 exit_func = THIRD();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2622 SET_TOP(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2623 SET_SECOND(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2624 SET_THIRD(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2625 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2626 /* XXX Not the fastest way to call it... */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2627 x = PyObject_CallFunctionObjArgs(exit_func, u, v, w,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2628 NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2629 Py_DECREF(exit_func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2630 if (x == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2631 break; /* Go to error exit */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2632
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2633 if (u != Py_None)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2634 err = PyObject_IsTrue(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2635 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2636 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2637 Py_DECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2638
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2639 if (err < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2640 break; /* Go to error exit */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2641 else if (err > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2642 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2643 /* There was an exception and a true return */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2644 STACKADJ(-2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2645 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2646 SET_TOP(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2647 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2648 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2649 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2650 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2651 /* The stack was rearranged to remove EXIT
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2652 above. Let END_FINALLY do its thing */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2653 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2654 PREDICT(END_FINALLY);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2655 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2656 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2657
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2658 case CALL_FUNCTION:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2659 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2660 PyObject **sp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2661 PCALL(PCALL_ALL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2662 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	2663 #ifdef WITH_TSC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2664 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	2665 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2666 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	2667 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2668 stack_pointer = sp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2669 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2670 if (x != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2671 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2672 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2673 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2674
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2675 case CALL_FUNCTION_VAR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2676 case CALL_FUNCTION_KW:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2677 case CALL_FUNCTION_VAR_KW:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2678 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2679 int na = oparg & 0xff;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2680 int nk = (oparg>>8) & 0xff;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2681 int flags = (opcode - CALL_FUNCTION) & 3;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2682 int n = na + 2 * nk;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2683 PyObject *pfunc, func, **sp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2684 PCALL(PCALL_ALL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2685 if (flags & CALL_FLAG_VAR)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2686 n++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2687 if (flags & CALL_FLAG_KW)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2688 n++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2689 pfunc = stack_pointer - n - 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2690 func = *pfunc;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2691
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2692 if (PyMethod_Check(func)
62457 ca4f2e9869b6 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting. Stefan Krah <stefan@bytereef.org> parents: 61463 diff changeset	2693 && PyMethod_GET_SELF(func) != NULL) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2694 PyObject *self = PyMethod_GET_SELF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2695 Py_INCREF(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2696 func = PyMethod_GET_FUNCTION(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2697 Py_INCREF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2698 Py_DECREF(*pfunc);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2699 *pfunc = self;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2700 na++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2701 } else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2702 Py_INCREF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2703 sp = stack_pointer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2704 READ_TIMESTAMP(intr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2705 x = ext_do_call(func, &sp, flags, na, nk);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2706 READ_TIMESTAMP(intr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2707 stack_pointer = sp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2708 Py_DECREF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2709
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2710 while (stack_pointer > pfunc) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2711 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2712 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2713 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2714 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2715 if (x != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2716 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2717 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2718 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2719
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2720 case MAKE_FUNCTION:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2721 v = POP(); /* code object */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2722 x = PyFunction_New(v, f->f_globals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2723 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2724 /* XXX Maybe this should be a separate opcode? */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2725 if (x != NULL && oparg > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2726 v = PyTuple_New(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2727 if (v == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2728 Py_DECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2729 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2730 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2731 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2732 while (--oparg >= 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2733 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2734 PyTuple_SET_ITEM(v, oparg, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2735 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2736 err = PyFunction_SetDefaults(x, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2737 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2738 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2739 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2740 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2741
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2742 case MAKE_CLOSURE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2743 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2744 v = POP(); /* code object */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2745 x = PyFunction_New(v, f->f_globals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2746 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2747 if (x != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2748 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2749 if (PyFunction_SetClosure(x, v) != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2750 /* Can't happen unless bytecode is corrupt. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2751 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2752 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2753 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2754 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2755 if (x != NULL && oparg > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2756 v = PyTuple_New(oparg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2757 if (v == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2758 Py_DECREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2759 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2760 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2761 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2762 while (--oparg >= 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2763 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2764 PyTuple_SET_ITEM(v, oparg, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2765 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2766 if (PyFunction_SetDefaults(x, v) != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2767 /* Can't happen unless
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2768 PyFunction_SetDefaults changes. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2769 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2770 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2771 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2772 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2773 PUSH(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2774 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2775 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2776
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2777 case BUILD_SLICE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2778 if (oparg == 3)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2779 w = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2780 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2781 w = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2782 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2783 u = TOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2784 x = PySlice_New(u, v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2785 Py_DECREF(u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2786 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2787 Py_XDECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2788 SET_TOP(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2789 if (x != NULL) continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2790 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2791
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2792 case EXTENDED_ARG:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2793 opcode = NEXTOP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2794 oparg = oparg<<16 \| NEXTARG();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2795 goto dispatch_opcode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2796
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2797 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2798 fprintf(stderr,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2799 "XXX lineno: %d, opcode: %d\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2800 PyFrame_GetLineNumber(f),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2801 opcode);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2802 PyErr_SetString(PyExc_SystemError, "unknown opcode");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2803 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2804 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2805
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2806 #ifdef CASE_TOO_BIG
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2807 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2808 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2809
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2810 } /* switch */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2811
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2812 on_error:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2813
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2814 READ_TIMESTAMP(inst1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2815
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2816 /* Quickly continue if no error occurred */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2817
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2818 if (why == WHY_NOT) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2819 if (err == 0 && x != NULL) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2820 #ifdef CHECKEXC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2821 /* This check is expensive! */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2822 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2823 fprintf(stderr,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2824 "XXX undetected error\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2825 else {
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2826 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2827 READ_TIMESTAMP(loop1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2828 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	2829 #ifdef CHECKEXC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2830 }
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2831 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2832 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2833 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2834 x = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2835 err = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2836 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2837
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2838 /* Double-check exception status */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2839
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2840 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2841 if (!PyErr_Occurred()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2842 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2843 "error return without exception set");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2844 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2845 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2846 }
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2847 #ifdef CHECKEXC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2848 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2849 /* This check is expensive! */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2850 if (PyErr_Occurred()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2851 char buf[128];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2852 sprintf(buf, "Stack unwind with exception "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2853 "set and why=%d", why);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2854 Py_FatalError(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2855 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2856 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2857 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2858
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2859 /* Log traceback info if this is a real exception */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2860
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2861 if (why == WHY_EXCEPTION) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2862 PyTraceBack_Here(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2863
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2864 if (tstate->c_tracefunc != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2865 call_exc_trace(tstate->c_tracefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2866 tstate->c_traceobj, f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2867 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2868
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2869 /* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2870
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2871 if (why == WHY_RERAISE)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2872 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2873
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2874 /* Unwind stacks if a (pseudo) exception occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2875
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2876 fast_block_end:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2877 while (why != WHY_NOT && f->f_iblock > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2878 /* Peek at the current block. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2879 PyTryBlock *b = &f->f_blockstack[f->f_iblock - 1];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2880
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2881 assert(why != WHY_YIELD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2882 if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2883 why = WHY_NOT;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2884 JUMPTO(PyInt_AS_LONG(retval));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2885 Py_DECREF(retval);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2886 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2887 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2888
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2889 /* Now we have to pop the block. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2890 f->f_iblock--;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2891
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2892 while (STACK_LEVEL() > b->b_level) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2893 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2894 Py_XDECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2895 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2896 if (b->b_type == SETUP_LOOP && why == WHY_BREAK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2897 why = WHY_NOT;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2898 JUMPTO(b->b_handler);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2899 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2900 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2901 if (b->b_type == SETUP_FINALLY \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2902 (b->b_type == SETUP_EXCEPT &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2903 why == WHY_EXCEPTION) \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2904 b->b_type == SETUP_WITH) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2905 if (why == WHY_EXCEPTION) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2906 PyObject exc, val, *tb;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2907 PyErr_Fetch(&exc, &val, &tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2908 if (val == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2909 val = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2910 Py_INCREF(val);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2911 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2912 /* Make the raw exception data
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2913 available to the handler,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2914 so a program can emulate the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2915 Python main loop. Don't do
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2916 this for 'finally'. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2917 if (b->b_type == SETUP_EXCEPT \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2918 b->b_type == SETUP_WITH) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2919 PyErr_NormalizeException(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2920 &exc, &val, &tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2921 set_exc_info(tstate,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2922 exc, val, tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2923 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2924 if (tb == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2925 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2926 PUSH(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2927 } else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2928 PUSH(tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2929 PUSH(val);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2930 PUSH(exc);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2931 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2932 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2933 if (why & (WHY_RETURN \| WHY_CONTINUE))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2934 PUSH(retval);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2935 v = PyInt_FromLong((long)why);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2936 PUSH(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2937 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2938 why = WHY_NOT;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2939 JUMPTO(b->b_handler);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2940 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2941 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2942 } /* unwind stack */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2943
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2944 /* End the loop if we still have an error (or return) */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2945
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2946 if (why != WHY_NOT)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2947 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2948 READ_TIMESTAMP(loop1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2949
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2950 } /* main loop */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2951
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2952 assert(why != WHY_YIELD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2953 /* Pop remaining stack entries. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2954 while (!EMPTY()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2955 v = POP();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2956 Py_XDECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2957 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2958
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2959 if (why != WHY_RETURN)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2960 retval = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2961
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2962 fast_yield:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2963 if (tstate->use_tracing) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2964 if (tstate->c_tracefunc) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2965 if (why == WHY_RETURN \|\| why == WHY_YIELD) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2966 if (call_trace(tstate->c_tracefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2967 tstate->c_traceobj, f,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2968 PyTrace_RETURN, retval)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2969 Py_XDECREF(retval);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2970 retval = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2971 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2972 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2973 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2974 else if (why == WHY_EXCEPTION) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2975 call_trace_protected(tstate->c_tracefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2976 tstate->c_traceobj, f,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2977 PyTrace_RETURN, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2978 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2979 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2980 if (tstate->c_profilefunc) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2981 if (why == WHY_EXCEPTION)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2982 call_trace_protected(tstate->c_profilefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2983 tstate->c_profileobj, f,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2984 PyTrace_RETURN, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2985 else if (call_trace(tstate->c_profilefunc,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2986 tstate->c_profileobj, f,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2987 PyTrace_RETURN, retval)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2988 Py_XDECREF(retval);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2989 retval = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2990 why = WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2991 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2992 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2993 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2994
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2995 if (tstate->frame->f_exc_type != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2996 reset_exc_info(tstate);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2997 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2998 assert(tstate->frame->f_exc_value == NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	2999 assert(tstate->frame->f_exc_traceback == NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3000 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3001
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3002 /* pop frame */
43408 81478465fef3 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 42333 diff changeset	3003 exit_eval_frame:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3004 Py_LeaveRecursiveCall();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3005 tstate->frame = f->f_back;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3006
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3007 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	3008 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	3009
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	3010 /* 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	3011 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	3012 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	3013
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3014 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3015 PyEval_EvalCodeEx(PyCodeObject co, PyObject globals, PyObject *locals,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3016 PyObject args, int argcount, PyObject kws, int kwcount,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3017 PyObject *defs, int defcount, 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	3018 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3019 register PyFrameObject *f;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3020 register PyObject *retval = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3021 register PyObject fastlocals, freevars;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3022 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3023 PyObject x, u;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3024
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3025 if (globals == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3026 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3027 "PyEval_EvalCodeEx: NULL globals");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3028 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3029 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3030
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3031 assert(tstate != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3032 assert(globals != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3033 f = PyFrame_New(tstate, co, globals, locals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3034 if (f == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3035 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3036
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3037 fastlocals = f->f_localsplus;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3038 freevars = f->f_localsplus + co->co_nlocals;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3039
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3040 if (co->co_argcount > 0 \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3041 co->co_flags & (CO_VARARGS \| CO_VARKEYWORDS)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3042 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3043 int n = argcount;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3044 PyObject *kwdict = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3045 if (co->co_flags & CO_VARKEYWORDS) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3046 kwdict = PyDict_New();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3047 if (kwdict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3048 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3049 i = co->co_argcount;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3050 if (co->co_flags & CO_VARARGS)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3051 i++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3052 SETLOCAL(i, kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3053 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3054 if (argcount > co->co_argcount) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3055 if (!(co->co_flags & CO_VARARGS)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3056 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3057 "%.200s() takes %s %d "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3058 "argument%s (%d given)",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3059 PyString_AsString(co->co_name),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3060 defcount ? "at most" : "exactly",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3061 co->co_argcount,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3062 co->co_argcount == 1 ? "" : "s",
64936 c9b08c58f063 Rolled back revisions 85003 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 64934 diff changeset	3063 argcount + kwcount);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3064 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3065 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3066 n = co->co_argcount;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3067 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3068 for (i = 0; i < n; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3069 x = args[i];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3070 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3071 SETLOCAL(i, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3072 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3073 if (co->co_flags & CO_VARARGS) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3074 u = PyTuple_New(argcount - n);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3075 if (u == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3076 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3077 SETLOCAL(co->co_argcount, u);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3078 for (i = n; i < argcount; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3079 x = args[i];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3080 Py_INCREF(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3081 PyTuple_SET_ITEM(u, i-n, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3082 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3083 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3084 for (i = 0; i < kwcount; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3085 PyObject **co_varnames;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3086 PyObject keyword = kws[2i];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3087 PyObject value = kws[2i + 1];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3088 int j;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3089 if (keyword == NULL \|\| !(PyString_Check(keyword)
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3090 #ifdef Py_USING_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3091 \|\| PyUnicode_Check(keyword)
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3092 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3093 )) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3094 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3095 "%.200s() keywords must be strings",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3096 PyString_AsString(co->co_name));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3097 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3098 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3099 /* Speed hack: do raw pointer compares. As names are
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3100 normally interned this should almost always hit. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3101 co_varnames = ((PyTupleObject *)(co->co_varnames))->ob_item;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3102 for (j = 0; j < co->co_argcount; j++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3103 PyObject *nm = co_varnames[j];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3104 if (nm == keyword)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3105 goto kw_found;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3106 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3107 /* Slow fallback, just in case */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3108 for (j = 0; j < co->co_argcount; j++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3109 PyObject *nm = co_varnames[j];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3110 int cmp = PyObject_RichCompareBool(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3111 keyword, nm, Py_EQ);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3112 if (cmp > 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3113 goto kw_found;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3114 else if (cmp < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3115 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3116 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3117 if (kwdict == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3118 PyObject *kwd_str = kwd_as_string(keyword);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3119 if (kwd_str) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3120 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3121 "%.200s() got an unexpected "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3122 "keyword argument '%.400s'",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3123 PyString_AsString(co->co_name),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3124 PyString_AsString(kwd_str));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3125 Py_DECREF(kwd_str);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3126 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3127 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3128 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3129 PyDict_SetItem(kwdict, keyword, value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3130 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3131 kw_found:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3132 if (GETLOCAL(j) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3133 PyObject *kwd_str = kwd_as_string(keyword);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3134 if (kwd_str) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3135 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3136 "%.200s() got multiple "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3137 "values for keyword "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3138 "argument '%.400s'",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3139 PyString_AsString(co->co_name),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3140 PyString_AsString(kwd_str));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3141 Py_DECREF(kwd_str);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3142 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3143 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3144 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3145 Py_INCREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3146 SETLOCAL(j, value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3147 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3148 if (argcount < co->co_argcount) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3149 int m = co->co_argcount - defcount;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3150 for (i = argcount; i < m; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3151 if (GETLOCAL(i) == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3152 int j, given = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3153 for (j = 0; j < co->co_argcount; j++)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3154 if (GETLOCAL(j))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3155 given++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3156 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3157 "%.200s() takes %s %d "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3158 "argument%s (%d given)",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3159 PyString_AsString(co->co_name),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3160 ((co->co_flags & CO_VARARGS) \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3161 defcount) ? "at least"
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3162 : "exactly",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3163 m, m == 1 ? "" : "s", given);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3164 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3165 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3166 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3167 if (n > m)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3168 i = n - m;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3169 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3170 i = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3171 for (; i < defcount; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3172 if (GETLOCAL(m+i) == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3173 PyObject *def = defs[i];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3174 Py_INCREF(def);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3175 SETLOCAL(m+i, def);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3176 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3177 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3178 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3179 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3180 else if (argcount > 0 \|\| kwcount > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3181 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3182 "%.200s() takes no arguments (%d given)",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3183 PyString_AsString(co->co_name),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3184 argcount + kwcount);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3185 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3186 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3187 /* Allocate and initialize storage for cell vars, and copy free
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3188 vars into frame. This isn't too efficient right now. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3189 if (PyTuple_GET_SIZE(co->co_cellvars)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3190 int i, j, nargs, found;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3191 char cellname, argname;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3192 PyObject *c;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3193
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3194 nargs = co->co_argcount;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3195 if (co->co_flags & CO_VARARGS)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3196 nargs++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3197 if (co->co_flags & CO_VARKEYWORDS)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3198 nargs++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3199
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3200 /* Initialize each cell var, taking into account
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3201 cell vars that are initialized from arguments.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3202
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3203 Should arrange for the compiler to put cellvars
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3204 that are arguments at the beginning of the cellvars
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3205 list so that we can march over it more efficiently?
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3206 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3207 for (i = 0; i < PyTuple_GET_SIZE(co->co_cellvars); ++i) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3208 cellname = PyString_AS_STRING(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3209 PyTuple_GET_ITEM(co->co_cellvars, i));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3210 found = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3211 for (j = 0; j < nargs; j++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3212 argname = PyString_AS_STRING(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3213 PyTuple_GET_ITEM(co->co_varnames, j));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3214 if (strcmp(cellname, argname) == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3215 c = PyCell_New(GETLOCAL(j));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3216 if (c == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3217 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3218 GETLOCAL(co->co_nlocals + i) = c;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3219 found = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3220 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3221 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3222 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3223 if (found == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3224 c = PyCell_New(NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3225 if (c == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3226 goto fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3227 SETLOCAL(co->co_nlocals + i, c);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3228 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3229 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3230 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3231 if (PyTuple_GET_SIZE(co->co_freevars)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3232 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3233 for (i = 0; i < PyTuple_GET_SIZE(co->co_freevars); ++i) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3234 PyObject *o = PyTuple_GET_ITEM(closure, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3235 Py_INCREF(o);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3236 freevars[PyTuple_GET_SIZE(co->co_cellvars) + i] = o;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3237 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3238 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3239
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3240 if (co->co_flags & CO_GENERATOR) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3241 /* Don't need to keep the reference to f_back, it will be set
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3242 * when the generator is resumed. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3243 Py_XDECREF(f->f_back);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3244 f->f_back = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3245
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3246 PCALL(PCALL_GENERATOR);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3247
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3248 /* Create a new generator that owns the ready to run frame
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3249 * and return that as the value. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3250 return PyGen_New(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3251 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3252
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3253 retval = PyEval_EvalFrameEx(f,0);
43408 81478465fef3 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 42333 diff changeset	3254
81478465fef3 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 42333 diff changeset	3255 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	3256
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3257 /* decref'ing the frame can cause __del__ methods to get invoked,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3258 which can call back into Python. While we're done with the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3259 current Python frame (f), the associated C stack is still in use,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3260 so recursion_depth must be boosted for the duration.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3261 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3262 assert(tstate != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3263 ++tstate->recursion_depth;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3264 Py_DECREF(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3265 --tstate->recursion_depth;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3266 return retval;
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	3267 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3268
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3269
54329 145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 54297 diff changeset	3270 static PyObject *
145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 54297 diff changeset	3271 special_lookup(PyObject o, char meth, PyObject **cache)
145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 54297 diff changeset	3272 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3273 PyObject *res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3274 if (PyInstance_Check(o)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3275 if (!*cache)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3276 return PyObject_GetAttrString(o, meth);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3277 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3278 return PyObject_GetAttr(o, *cache);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3279 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3280 res = _PyObject_LookupSpecial(o, meth, cache);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3281 if (res == NULL && !PyErr_Occurred()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3282 PyErr_SetObject(PyExc_AttributeError, *cache);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3283 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3284 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3285 return res;
54329 145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 54297 diff changeset	3286 }
145376df3ad7 add a SETUP_WITH opcode Benjamin Peterson <benjamin@python.org> parents: 54297 diff changeset	3287
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3288
50936 dbc14acdde37 allow unicode keyword arguments for the ** syntax #4978 Benjamin Peterson <benjamin@python.org> parents: 50674 diff changeset	3289 static PyObject *
dbc14acdde37 allow unicode keyword arguments for the ** syntax #4978 Benjamin Peterson <benjamin@python.org> parents: 50674 diff changeset	3290 kwd_as_string(PyObject *kwd) {
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3291 #ifdef Py_USING_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3292 if (PyString_Check(kwd)) {
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3293 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3294 assert(PyString_Check(kwd));
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3295 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3296 Py_INCREF(kwd);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3297 return kwd;
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3298 #ifdef Py_USING_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3299 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3300 return _PyUnicode_AsDefaultEncodedString(kwd, "replace");
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	3301 #endif
50936 dbc14acdde37 allow unicode keyword arguments for the ** syntax #4978 Benjamin Peterson <benjamin@python.org> parents: 50674 diff changeset	3302 }
dbc14acdde37 allow unicode keyword arguments for the ** syntax #4978 Benjamin Peterson <benjamin@python.org> parents: 50674 diff changeset	3303
dbc14acdde37 allow unicode keyword arguments for the ** syntax #4978 Benjamin Peterson <benjamin@python.org> parents: 50674 diff changeset	3304
28121 c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3305 /* Implementation notes for set_exc_info() and reset_exc_info():
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3306
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3307 - Below, 'exc_ZZZ' stands for 'exc_type', 'exc_value' and
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3308 'exc_traceback'. These always travel together.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3309
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3310 - tstate->curexc_ZZZ is the "hot" exception that is set by
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3311 PyErr_SetString(), cleared by PyErr_Clear(), and so on.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3312
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3313 - Once an exception is caught by an except clause, it is transferred
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3314 from tstate->curexc_ZZZ to tstate->exc_ZZZ, from which sys.exc_info()
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3315 can pick it up. This is the primary task of set_exc_info().
38418 708eaf0896bf Patch 1145039. Tim Peters <tim.peters@gmail.com> parents: 38352 diff changeset	3316 XXX That can't be right: set_exc_info() doesn't look at tstate->curexc_ZZZ.
28121 c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3317
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3318 - Now let me explain the complicated dance with frame->f_exc_ZZZ.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3319
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3320 Long ago, when none of this existed, there were just a few globals:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3321 one set corresponding to the "hot" exception, and one set
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3322 corresponding to sys.exc_ZZZ. (Actually, the latter weren't C
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3323 globals; they were simply stored as sys.exc_ZZZ. For backwards
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3324 compatibility, they still are!) The problem was that in code like
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3325 this:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3326
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3327 try:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3328 "something that may fail"
28121 c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3329 except "some exception":
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3330 "do something else first"
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3331 "print the exception from sys.exc_ZZZ."
28121 c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3332
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3333 if "do something else first" invoked something that raised and caught
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3334 an exception, sys.exc_ZZZ were overwritten. That was a frequent
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3335 cause of subtle bugs. I fixed this by changing the semantics as
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3336 follows:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3337
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3338 - Within one frame, sys.exc_ZZZ will hold the last exception caught
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3339 in that frame.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3340
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3341 - But initially, and as long as no exception is caught in a given
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3342 frame, sys.exc_ZZZ will hold the last exception caught in the
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3343 previous frame (or the frame before that, etc.).
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3344
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3345 The first bullet fixed the bug in the above example. The second
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3346 bullet was for backwards compatibility: it was (and is) common to
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3347 have a function that is called when an exception is caught, and to
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3348 have that function access the caught exception via sys.exc_ZZZ.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3349 (Example: traceback.print_exc()).
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3350
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3351 At the same time I fixed the problem that sys.exc_ZZZ weren't
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3352 thread-safe, by introducing sys.exc_info() which gets it from tstate;
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3353 but that's really a separate improvement.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3354
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3355 The reset_exc_info() function in ceval.c restores the tstate->exc_ZZZ
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3356 variables to what they were before the current frame was called. The
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3357 set_exc_info() function saves them on the frame so that
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3358 reset_exc_info() can restore them. The invariant is that
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3359 frame->f_exc_ZZZ is NULL iff the current frame never caught an
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3360 exception (where "catching" an exception applies only to successful
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3361 except clauses); and if the current frame ever caught an exception,
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3362 frame->f_exc_ZZZ is the exception that was stored in tstate->exc_ZZZ
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3363 at the start of the current frame.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3364
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3365 */
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	3366
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3367 static void
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3368 set_exc_info(PyThreadState *tstate,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3369 PyObject type, PyObject value, PyObject *tb)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3370 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3371 PyFrameObject *frame = tstate->frame;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3372 PyObject tmp_type, tmp_value, *tmp_tb;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3373
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3374 assert(type != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3375 assert(frame != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3376 if (frame->f_exc_type == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3377 assert(frame->f_exc_value == NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3378 assert(frame->f_exc_traceback == NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3379 /* This frame didn't catch an exception before. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3380 /* Save previous exception of this thread in this frame. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3381 if (tstate->exc_type == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3382 /* XXX Why is this set to Py_None? */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3383 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3384 tstate->exc_type = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3385 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3386 Py_INCREF(tstate->exc_type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3387 Py_XINCREF(tstate->exc_value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3388 Py_XINCREF(tstate->exc_traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3389 frame->f_exc_type = tstate->exc_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3390 frame->f_exc_value = tstate->exc_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3391 frame->f_exc_traceback = tstate->exc_traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3392 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3393 /* Set new exception for this thread. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3394 tmp_type = tstate->exc_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3395 tmp_value = tstate->exc_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3396 tmp_tb = tstate->exc_traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3397 Py_INCREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3398 Py_XINCREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3399 Py_XINCREF(tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3400 tstate->exc_type = type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3401 tstate->exc_value = value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3402 tstate->exc_traceback = tb;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3403 Py_XDECREF(tmp_type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3404 Py_XDECREF(tmp_value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3405 Py_XDECREF(tmp_tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3406 /* For b/w compatibility */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3407 PySys_SetObject("exc_type", type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3408 PySys_SetObject("exc_value", value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3409 PySys_SetObject("exc_traceback", tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3410 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3411
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3412 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3413 reset_exc_info(PyThreadState *tstate)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3414 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3415 PyFrameObject *frame;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3416 PyObject tmp_type, tmp_value, *tmp_tb;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3417
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3418 /* It's a precondition that the thread state's frame caught an
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3419 * exception -- verify in a debug build.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3420 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3421 assert(tstate != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3422 frame = tstate->frame;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3423 assert(frame != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3424 assert(frame->f_exc_type != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3425
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3426 /* Copy the frame's exception info back to the thread state. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3427 tmp_type = tstate->exc_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3428 tmp_value = tstate->exc_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3429 tmp_tb = tstate->exc_traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3430 Py_INCREF(frame->f_exc_type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3431 Py_XINCREF(frame->f_exc_value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3432 Py_XINCREF(frame->f_exc_traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3433 tstate->exc_type = frame->f_exc_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3434 tstate->exc_value = frame->f_exc_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3435 tstate->exc_traceback = frame->f_exc_traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3436 Py_XDECREF(tmp_type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3437 Py_XDECREF(tmp_value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3438 Py_XDECREF(tmp_tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3439
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3440 /* For b/w compatibility */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3441 PySys_SetObject("exc_type", frame->f_exc_type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3442 PySys_SetObject("exc_value", frame->f_exc_value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3443 PySys_SetObject("exc_traceback", frame->f_exc_traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3444
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3445 /* Clear the frame's exception info. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3446 tmp_type = frame->f_exc_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3447 tmp_value = frame->f_exc_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3448 tmp_tb = frame->f_exc_traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3449 frame->f_exc_type = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3450 frame->f_exc_value = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3451 frame->f_exc_traceback = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3452 Py_DECREF(tmp_type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3453 Py_XDECREF(tmp_value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3454 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3455 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3456
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	3457 /* 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	3458 This consumes a reference count to each of its arguments. */
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3459 static enum why_code
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3460 do_raise(PyObject type, PyObject value, PyObject *tb)
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3461 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3462 if (type == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3463 /* Reraise */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3464 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3465 type = tstate->exc_type == NULL ? Py_None : tstate->exc_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3466 value = tstate->exc_value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3467 tb = tstate->exc_traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3468 Py_XINCREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3469 Py_XINCREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3470 Py_XINCREF(tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3471 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3472
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3473 /* We support the following forms of raise:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3474 raise <class>, <classinstance>
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3475 raise <class>, <argument tuple>
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3476 raise <class>, None
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3477 raise <class>, <argument>
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3478 raise <classinstance>, None
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3479 raise <string>, <object>
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3480 raise <string>, None
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3481
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3482 An omitted second argument is the same as None.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3483
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3484 In addition, raise <tuple>, <anything> is the same as
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3485 raising the tuple's first item (and it better have one!);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3486 this rule is applied recursively.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3487
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3488 Finally, an optional third argument can be supplied, which
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3489 gives the traceback to be substituted (useful when
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3490 re-raising an exception after examining it). */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3491
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3492 /* First, check the traceback argument, replacing None with
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3493 NULL. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3494 if (tb == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3495 Py_DECREF(tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3496 tb = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3497 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3498 else if (tb != NULL && !PyTraceBack_Check(tb)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3499 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3500 "raise: arg 3 must be a traceback or None");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3501 goto raise_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3502 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3503
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3504 /* Next, replace a missing value with None */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3505 if (value == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3506 value = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3507 Py_INCREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3508 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3509
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3510 /* Next, repeatedly, replace a tuple exception with its first item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3511 while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3512 PyObject *tmp = type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3513 type = PyTuple_GET_ITEM(type, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3514 Py_INCREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3515 Py_DECREF(tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3516 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3517
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3518 if (PyExceptionClass_Check(type))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3519 PyErr_NormalizeException(&type, &value, &tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3520
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3521 else if (PyExceptionInstance_Check(type)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3522 /* Raising an instance. The value should be a dummy. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3523 if (value != Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3524 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3525 "instance exception may not have a separate value");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3526 goto raise_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3527 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3528 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3529 /* Normalize to raise <class>, <instance> */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3530 Py_DECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3531 value = type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3532 type = PyExceptionInstance_Class(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3533 Py_INCREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3534 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3535 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3536 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3537 /* Not something you can raise. You get an exception
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3538 anyway, just not what you specified :-) */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3539 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3540 "exceptions must be old-style classes or "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3541 "derived from BaseException, not %s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3542 type->ob_type->tp_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3543 goto raise_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3544 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3545
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3546 assert(PyExceptionClass_Check(type));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3547 if (Py_Py3kWarningFlag && PyClass_Check(type)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3548 if (PyErr_WarnEx(PyExc_DeprecationWarning,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3549 "exceptions must derive from BaseException "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3550 "in 3.x", 1) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3551 goto raise_error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3552 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3553
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3554 PyErr_Restore(type, value, tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3555 if (tb == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3556 return WHY_EXCEPTION;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3557 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3558 return WHY_RERAISE;
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	3559 raise_error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3560 Py_XDECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3561 Py_XDECREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3562 Py_XDECREF(tb);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3563 return WHY_EXCEPTION;
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	3564 }
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	3565
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3566 /* Iterate v argcnt times and store the results on the stack (via decreasing
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3567 sp). Return 1 for success, 0 if error. */
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3568
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3569 static int
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3570 unpack_iterable(PyObject v, int argcnt, PyObject *sp)
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3571 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3572 int i = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3573 PyObject it; / iter(v) */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3574 PyObject *w;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3575
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3576 assert(v != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3577
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3578 it = PyObject_GetIter(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3579 if (it == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3580 goto Error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3581
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3582 for (; i < argcnt; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3583 w = PyIter_Next(it);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3584 if (w == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3585 /* Iterator done, via error or exhaustion. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3586 if (!PyErr_Occurred()) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3587 PyErr_Format(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3588 "need more than %d value%s to unpack",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3589 i, i == 1 ? "" : "s");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3590 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3591 goto Error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3592 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3593 *--sp = w;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3594 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3595
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3596 /* We better have exhausted the iterator now. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3597 w = PyIter_Next(it);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3598 if (w == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3599 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3600 goto Error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3601 Py_DECREF(it);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3602 return 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3603 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3604 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3605 PyErr_SetString(PyExc_ValueError, "too many values to unpack");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3606 /* fall through */
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3607 Error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3608 for (; i > 0; i--, sp++)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3609 Py_DECREF(*sp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3610 Py_XDECREF(it);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3611 return 0;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3612 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3613
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3614
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3615 #ifdef LLTRACE
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3616 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3617 prtrace(PyObject v, char str)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3618 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3619 printf("%s ", str);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3620 if (PyObject_Print(v, stdout, 0) != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3621 PyErr_Clear(); /* Don't know what else to do */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3622 printf("\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3623 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3624 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3625 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3626
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3627 static void
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3628 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	3629 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3630 PyObject type, value, traceback, arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3631 int err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3632 PyErr_Fetch(&type, &value, &traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3633 if (value == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3634 value = Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3635 Py_INCREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3636 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3637 arg = PyTuple_Pack(3, type, value, traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3638 if (arg == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3639 PyErr_Restore(type, value, traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3640 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3641 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3642 err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3643 Py_DECREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3644 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3645 PyErr_Restore(type, value, traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3646 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3647 Py_XDECREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3648 Py_XDECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3649 Py_XDECREF(traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3650 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3651 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3652
43845 76844a0a579f Merge from py3k branch: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43784 diff changeset	3653 static int
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3654 call_trace_protected(Py_tracefunc func, PyObject obj, PyFrameObject frame,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3655 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	3656 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3657 PyObject type, value, *traceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3658 int err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3659 PyErr_Fetch(&type, &value, &traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3660 err = call_trace(func, obj, frame, what, arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3661 if (err == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3662 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3663 PyErr_Restore(type, value, traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3664 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3665 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3666 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3667 Py_XDECREF(type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3668 Py_XDECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3669 Py_XDECREF(traceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3670 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3671 }
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3672 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3673
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3674 static int
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3675 call_trace(Py_tracefunc func, PyObject obj, PyFrameObject frame,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3676 int what, PyObject *arg)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3677 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3678 register PyThreadState *tstate = frame->f_tstate;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3679 int result;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3680 if (tstate->tracing)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3681 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3682 tstate->tracing++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3683 tstate->use_tracing = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3684 result = func(obj, frame, what, arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3685 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3686 \|\| (tstate->c_profilefunc != NULL));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3687 tstate->tracing--;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3688 return result;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3689 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3690
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3691 PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3692 _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	3693 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3694 PyFrameObject *frame = PyEval_GetFrame();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3695 PyThreadState *tstate = frame->f_tstate;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3696 int save_tracing = tstate->tracing;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3697 int save_use_tracing = tstate->use_tracing;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3698 PyObject *result;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3699
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3700 tstate->tracing = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3701 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3702 \|\| (tstate->c_profilefunc != NULL));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3703 result = PyObject_Call(func, args, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3704 tstate->tracing = save_tracing;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3705 tstate->use_tracing = save_use_tracing;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3706 return result;
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3707 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3708
54297 dddf424bd669 Issue #6042: Jeffrey Yasskin <jyasskin@gmail.com> parents: 53931 diff changeset	3709 /* See Objects/lnotab_notes.txt for a description of how tracing works. */
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3710 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	3711 maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3712 PyFrameObject frame, int instr_lb, int *instr_ub,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3713 int *instr_prev)
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3714 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3715 int result = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3716 int line = frame->f_lineno;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3717
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3718 /* If the last instruction executed isn't in the current
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3719 instruction window, reset the window.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3720 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3721 if (frame->f_lasti < instr_lb \|\| frame->f_lasti >= instr_ub) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3722 PyAddrPair bounds;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3723 line = _PyCode_CheckLineNumber(frame->f_code, frame->f_lasti,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3724 &bounds);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3725 *instr_lb = bounds.ap_lower;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3726 *instr_ub = bounds.ap_upper;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3727 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3728 /* If the last instruction falls at the start of a line or if
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3729 it represents a jump backwards, update the frame's line
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3730 number and call the trace function. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3731 if (frame->f_lasti == instr_lb \|\| frame->f_lasti < instr_prev) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3732 frame->f_lineno = line;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3733 result = call_trace(func, obj, frame, PyTrace_LINE, Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3734 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3735 *instr_prev = frame->f_lasti;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3736 return result;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3737 }
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3738
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3739 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3740 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	3741 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3742 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3743 PyObject *temp = tstate->c_profileobj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3744 Py_XINCREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3745 tstate->c_profilefunc = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3746 tstate->c_profileobj = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3747 /* Must make sure that tracing is not ignored if 'temp' is freed */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3748 tstate->use_tracing = tstate->c_tracefunc != NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3749 Py_XDECREF(temp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3750 tstate->c_profilefunc = func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3751 tstate->c_profileobj = arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3752 /* Flag that tracing or profiling is turned on */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3753 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	3754 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3755
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3756 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3757 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	3758 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3759 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3760 PyObject *temp = tstate->c_traceobj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3761 _Py_TracingPossible += (func != NULL) - (tstate->c_tracefunc != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3762 Py_XINCREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3763 tstate->c_tracefunc = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3764 tstate->c_traceobj = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3765 /* Must make sure that profiling is not ignored if 'temp' is freed */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3766 tstate->use_tracing = tstate->c_profilefunc != NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3767 Py_XDECREF(temp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3768 tstate->c_tracefunc = func;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3769 tstate->c_traceobj = arg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3770 /* Flag that tracing or profiling is turned on */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3771 tstate->use_tracing = ((func != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3772 \|\| (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	3773 }
4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	3774
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3775 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3776 PyEval_GetBuiltins(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3777 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3778 PyFrameObject *current_frame = PyEval_GetFrame();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3779 if (current_frame == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3780 return PyThreadState_GET()->interp->builtins;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3781 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3782 return current_frame->f_builtins;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3783 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3784
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3785 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3786 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	3787 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3788 PyFrameObject *current_frame = PyEval_GetFrame();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3789 if (current_frame == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3790 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3791 PyFrame_FastToLocals(current_frame);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3792 return current_frame->f_locals;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3793 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3794
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3795 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3796 PyEval_GetGlobals(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3797 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3798 PyFrameObject *current_frame = PyEval_GetFrame();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3799 if (current_frame == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3800 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3801 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3802 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3803 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3804
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3805 PyFrameObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3806 PyEval_GetFrame(void)
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3807 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3808 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3809 return _PyThreadState_GetFrame(tstate);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3810 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3811
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3812 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3813 PyEval_GetRestricted(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3814 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3815 PyFrameObject *current_frame = PyEval_GetFrame();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3816 return current_frame == NULL ? 0 : PyFrame_IsRestricted(current_frame);
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3817 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3818
5606 495fbde64a73 Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5557 diff changeset	3819 int
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3820 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	3821 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3822 PyFrameObject *current_frame = PyEval_GetFrame();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3823 int result = cf->cf_flags != 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3824
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3825 if (current_frame != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3826 const int codeflags = current_frame->f_code->co_flags;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3827 const int compilerflags = codeflags & PyCF_MASK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3828 if (compilerflags) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3829 result = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3830 cf->cf_flags \|= compilerflags;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3831 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3832 #if 0 /* future keyword */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3833 if (codeflags & CO_GENERATOR_ALLOWED) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3834 result = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3835 cf->cf_flags \|= CO_GENERATOR_ALLOWED;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3836 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3837 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3838 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3839 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	3840 }
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	3841
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	3842 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3843 Py_FlushLine(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3844 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3845 PyObject *f = PySys_GetObject("stdout");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3846 if (f == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3847 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3848 if (!PyFile_SoftSpace(f, 0))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3849 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3850 return PyFile_WriteString("\n", f);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3851 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3852
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3853
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3854 /* External interface to call any callable object.
60129 6df6c19fbae3 Issue #8276: PyEval_CallObject() is now only available in macro form. The Antoine Pitrou <solipsis@pitrou.net> parents: 59855 diff changeset	3855 The arg must be a tuple or NULL. The kw must be a dict or NULL. */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3856
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3857 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3858 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	3859 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3860 PyObject *result;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3861
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3862 if (arg == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3863 arg = PyTuple_New(0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3864 if (arg == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3865 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3866 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3867 else if (!PyTuple_Check(arg)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3868 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3869 "argument list must be a tuple");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3870 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3871 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3872 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3873 Py_INCREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3874
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3875 if (kw != NULL && !PyDict_Check(kw)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3876 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3877 "keyword list must be a dictionary");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3878 Py_DECREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3879 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3880 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3881
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3882 result = PyObject_Call(func, arg, kw);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3883 Py_DECREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3884 return result;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3885 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3886
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3887 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3888 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	3889 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3890 if (PyMethod_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3891 return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3892 else if (PyFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3893 return PyString_AsString(((PyFunctionObject*)func)->func_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3894 else if (PyCFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3895 return ((PyCFunctionObject*)func)->m_ml->ml_name;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3896 else if (PyClass_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3897 return PyString_AsString(((PyClassObject*)func)->cl_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3898 else if (PyInstance_Check(func)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3899 return PyString_AsString(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3900 ((PyInstanceObject*)func)->in_class->cl_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3901 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3902 return func->ob_type->tp_name;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3903 }
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3904 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3905
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3906 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3907 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	3908 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3909 if (PyMethod_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3910 return "()";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3911 else if (PyFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3912 return "()";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3913 else if (PyCFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3914 return "()";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3915 else if (PyClass_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3916 return " constructor";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3917 else if (PyInstance_Check(func)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3918 return " instance";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3919 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3920 return " object";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3921 }
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3922 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3923
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3924 static void
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3925 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	3926 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3927 if (flags & METH_NOARGS)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3928 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3929 "%.200s() takes no arguments (%d given)",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3930 ((PyCFunctionObject *)func)->m_ml->ml_name,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3931 nargs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3932 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3933 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3934 "%.200s() takes exactly one argument (%d given)",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3935 ((PyCFunctionObject *)func)->m_ml->ml_name,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3936 nargs);
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3937 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3938
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	3939 #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	3940 if (tstate->use_tracing && tstate->c_profilefunc) { \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3941 if (call_trace(tstate->c_profilefunc, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3942 tstate->c_profileobj, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3943 tstate->frame, PyTrace_C_CALL, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3944 func)) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3945 x = NULL; \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3946 } \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3947 else { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3948 x = call; \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3949 if (tstate->c_profilefunc != NULL) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3950 if (x == NULL) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3951 call_trace_protected(tstate->c_profilefunc, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3952 tstate->c_profileobj, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3953 tstate->frame, PyTrace_C_EXCEPTION, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3954 func); \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3955 /* XXX should pass (type, value, tb) */ \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3956 } else { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3957 if (call_trace(tstate->c_profilefunc, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3958 tstate->c_profileobj, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3959 tstate->frame, PyTrace_C_RETURN, \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3960 func)) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3961 Py_DECREF(x); \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3962 x = NULL; \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3963 } \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3964 } \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3965 } \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3966 } \
32409 77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3967 } else { \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3968 x = call; \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3969 }
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3970
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	3971 static PyObject *
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3972 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	3973 #ifdef WITH_TSC
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3974 , uint64* pintr0, uint64* pintr1
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3975 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3976 )
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3977 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3978 int na = oparg & 0xff;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3979 int nk = (oparg>>8) & 0xff;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3980 int n = na + 2 * nk;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3981 PyObject *pfunc = (pp_stack) - n - 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3982 PyObject func = pfunc;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3983 PyObject x, w;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3984
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3985 /* Always dispatch PyCFunction first, because these are
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3986 presumed to be the most frequent callable object.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3987 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3988 if (PyCFunction_Check(func) && nk == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3989 int flags = PyCFunction_GET_FLAGS(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3990 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3991
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3992 PCALL(PCALL_CFUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3993 if (flags & (METH_NOARGS \| METH_O)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3994 PyCFunction meth = PyCFunction_GET_FUNCTION(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3995 PyObject *self = PyCFunction_GET_SELF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3996 if (flags & METH_NOARGS && na == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3997 C_TRACE(x, (*meth)(self,NULL));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3998 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	3999 else if (flags & METH_O && na == 1) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4000 PyObject arg = EXT_POP(pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4001 C_TRACE(x, (*meth)(self,arg));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4002 Py_DECREF(arg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4003 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4004 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4005 err_args(func, flags, na);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4006 x = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4007 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4008 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4009 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4010 PyObject *callargs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4011 callargs = load_args(pp_stack, na);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4012 READ_TIMESTAMP(*pintr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4013 C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4014 READ_TIMESTAMP(*pintr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4015 Py_XDECREF(callargs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4016 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4017 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4018 if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4019 /* optimize access to bound methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4020 PyObject *self = PyMethod_GET_SELF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4021 PCALL(PCALL_METHOD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4022 PCALL(PCALL_BOUND_METHOD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4023 Py_INCREF(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4024 func = PyMethod_GET_FUNCTION(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4025 Py_INCREF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4026 Py_DECREF(*pfunc);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4027 *pfunc = self;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4028 na++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4029 n++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4030 } else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4031 Py_INCREF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4032 READ_TIMESTAMP(*pintr0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4033 if (PyFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4034 x = fast_function(func, pp_stack, n, na, nk);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4035 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4036 x = do_call(func, pp_stack, na, nk);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4037 READ_TIMESTAMP(*pintr1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4038 Py_DECREF(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4039 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4040
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4041 /* Clear the stack of the function object. Also removes
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4042 the arguments in case they weren't consumed already
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4043 (fast_function() and err_args() leave them on the stack).
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4044 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4045 while ((*pp_stack) > pfunc) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4046 w = EXT_POP(*pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4047 Py_DECREF(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4048 PCALL(PCALL_POP);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4049 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4050 return x;
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	4051 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	4052
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	4053 /* 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	4054 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	4055 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	4056 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	4057 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	4058 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	4059 done before evaluating the frame.
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4060 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4061
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4062 static PyObject *
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4063 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	4064 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4065 PyCodeObject co = (PyCodeObject )PyFunction_GET_CODE(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4066 PyObject *globals = PyFunction_GET_GLOBALS(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4067 PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4068 PyObject **d = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4069 int nd = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4070
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4071 PCALL(PCALL_FUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4072 PCALL(PCALL_FAST_FUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4073 if (argdefs == NULL && co->co_argcount == n && nk==0 &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4074 co->co_flags == (CO_OPTIMIZED \| CO_NEWLOCALS \| CO_NOFREE)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4075 PyFrameObject *f;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4076 PyObject *retval = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4077 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4078 PyObject fastlocals, stack;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4079 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4080
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4081 PCALL(PCALL_FASTER_FUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4082 assert(globals != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4083 /* XXX Perhaps we should create a specialized
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4084 PyFrame_New() that doesn't take locals, but does
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4085 take builtins without sanity checking them.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4086 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4087 assert(tstate != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4088 f = PyFrame_New(tstate, co, globals, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4089 if (f == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4090 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4091
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4092 fastlocals = f->f_localsplus;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4093 stack = (*pp_stack) - n;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4094
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4095 for (i = 0; i < n; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4096 Py_INCREF(*stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4097 fastlocals[i] = *stack++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4098 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4099 retval = PyEval_EvalFrameEx(f,0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4100 ++tstate->recursion_depth;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4101 Py_DECREF(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4102 --tstate->recursion_depth;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4103 return retval;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4104 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4105 if (argdefs != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4106 d = &PyTuple_GET_ITEM(argdefs, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4107 nd = Py_SIZE(argdefs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4108 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4109 return PyEval_EvalCodeEx(co, globals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4110 (PyObject )NULL, (pp_stack)-n, na,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4111 (pp_stack)-2nk, nk, d, nd,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4112 PyFunction_GET_CLOSURE(func));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4113 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4114
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4115 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	4116 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	4117 PyObject *func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4118 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4119 PyObject *kwdict = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4120 if (orig_kwdict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4121 kwdict = PyDict_New();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4122 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4123 kwdict = PyDict_Copy(orig_kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4124 Py_DECREF(orig_kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4125 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4126 if (kwdict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4127 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4128 while (--nk >= 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4129 int err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4130 PyObject value = EXT_POP(pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4131 PyObject key = EXT_POP(pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4132 if (PyDict_GetItem(kwdict, key) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4133 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4134 "%.200s%s got multiple values "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4135 "for keyword argument '%.200s'",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4136 PyEval_GetFuncName(func),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4137 PyEval_GetFuncDesc(func),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4138 PyString_AsString(key));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4139 Py_DECREF(key);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4140 Py_DECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4141 Py_DECREF(kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4142 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4143 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4144 err = PyDict_SetItem(kwdict, key, value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4145 Py_DECREF(key);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4146 Py_DECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4147 if (err) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4148 Py_DECREF(kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4149 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4150 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4151 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4152 return kwdict;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4153 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4154
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4155 static PyObject *
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4156 update_star_args(int nstack, int nstar, PyObject *stararg,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4157 PyObject ***pp_stack)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4158 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4159 PyObject callargs, w;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4160
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4161 callargs = PyTuple_New(nstack + nstar);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4162 if (callargs == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4163 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4164 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4165 if (nstar) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4166 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4167 for (i = 0; i < nstar; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4168 PyObject *a = PyTuple_GET_ITEM(stararg, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4169 Py_INCREF(a);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4170 PyTuple_SET_ITEM(callargs, nstack + i, a);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4171 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4172 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4173 while (--nstack >= 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4174 w = EXT_POP(*pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4175 PyTuple_SET_ITEM(callargs, nstack, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4176 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4177 return callargs;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4178 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4179
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4180 static PyObject *
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4181 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	4182 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4183 PyObject *args = PyTuple_New(na);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4184 PyObject *w;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4185
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4186 if (args == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4187 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4188 while (--na >= 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4189 w = EXT_POP(*pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4190 PyTuple_SET_ITEM(args, na, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4191 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4192 return args;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4193 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4194
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4195 static PyObject *
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4196 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	4197 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4198 PyObject *callargs = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4199 PyObject *kwdict = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4200 PyObject *result = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4201
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4202 if (nk > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4203 kwdict = update_keyword_args(NULL, nk, pp_stack, func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4204 if (kwdict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4205 goto call_fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4206 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4207 callargs = load_args(pp_stack, na);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4208 if (callargs == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4209 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	4210 #ifdef CALL_PROFILE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4211 /* At this point, we have to look at the type of func to
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4212 update the call stats properly. Do it here so as to avoid
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4213 exposing the call stats machinery outside ceval.c
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4214 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4215 if (PyFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4216 PCALL(PCALL_FUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4217 else if (PyMethod_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4218 PCALL(PCALL_METHOD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4219 else if (PyType_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4220 PCALL(PCALL_TYPE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4221 else if (PyCFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4222 PCALL(PCALL_CFUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4223 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4224 PCALL(PCALL_OTHER);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4225 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4226 if (PyCFunction_Check(func)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4227 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4228 C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4229 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4230 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4231 result = PyObject_Call(func, callargs, kwdict);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4232 call_fail:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4233 Py_XDECREF(callargs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4234 Py_XDECREF(kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4235 return result;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4236 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4237
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4238 static PyObject *
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4239 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	4240 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4241 int nstar = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4242 PyObject *callargs = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4243 PyObject *stararg = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4244 PyObject *kwdict = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4245 PyObject *result = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4246
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4247 if (flags & CALL_FLAG_KW) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4248 kwdict = EXT_POP(*pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4249 if (!PyDict_Check(kwdict)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4250 PyObject *d;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4251 d = PyDict_New();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4252 if (d == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4253 goto ext_call_fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4254 if (PyDict_Update(d, kwdict) != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4255 Py_DECREF(d);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4256 /* PyDict_Update raises attribute
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4257 * error (percolated from an attempt
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4258 * to get 'keys' attribute) instead of
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4259 * a type error if its second argument
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4260 * is not a mapping.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4261 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4262 if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4263 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4264 "%.200s%.200s argument after ** "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4265 "must be a mapping, not %.200s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4266 PyEval_GetFuncName(func),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4267 PyEval_GetFuncDesc(func),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4268 kwdict->ob_type->tp_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4269 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4270 goto ext_call_fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4271 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4272 Py_DECREF(kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4273 kwdict = d;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4274 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4275 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4276 if (flags & CALL_FLAG_VAR) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4277 stararg = EXT_POP(*pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4278 if (!PyTuple_Check(stararg)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4279 PyObject *t = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4280 t = PySequence_Tuple(stararg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4281 if (t == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4282 if (PyErr_ExceptionMatches(PyExc_TypeError)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4283 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4284 "%.200s%.200s argument after * "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4285 "must be a sequence, not %200s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4286 PyEval_GetFuncName(func),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4287 PyEval_GetFuncDesc(func),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4288 stararg->ob_type->tp_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4289 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4290 goto ext_call_fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4291 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4292 Py_DECREF(stararg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4293 stararg = t;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4294 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4295 nstar = PyTuple_GET_SIZE(stararg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4296 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4297 if (nk > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4298 kwdict = update_keyword_args(kwdict, nk, pp_stack, func);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4299 if (kwdict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4300 goto ext_call_fail;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4301 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4302 callargs = update_star_args(na, nstar, stararg, pp_stack);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4303 if (callargs == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4304 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	4305 #ifdef CALL_PROFILE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4306 /* At this point, we have to look at the type of func to
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4307 update the call stats properly. Do it here so as to avoid
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4308 exposing the call stats machinery outside ceval.c
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4309 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4310 if (PyFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4311 PCALL(PCALL_FUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4312 else if (PyMethod_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4313 PCALL(PCALL_METHOD);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4314 else if (PyType_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4315 PCALL(PCALL_TYPE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4316 else if (PyCFunction_Check(func))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4317 PCALL(PCALL_CFUNCTION);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4318 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4319 PCALL(PCALL_OTHER);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4320 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4321 if (PyCFunction_Check(func)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4322 PyThreadState *tstate = PyThreadState_GET();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4323 C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4324 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4325 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4326 result = PyObject_Call(func, callargs, kwdict);
43408 81478465fef3 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 42333 diff changeset	4327 ext_call_fail:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4328 Py_XDECREF(callargs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4329 Py_XDECREF(kwdict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4330 Py_XDECREF(stararg);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4331 return result;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4332 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4333
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4334 /* 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	4335 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	4336 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	4337 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	4338 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	4339 */
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	4340 /* 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	4341 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	4342 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	4343 */
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	4344 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	4345 _PyEval_SliceIndex(PyObject v, Py_ssize_t pi)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4346 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4347 if (v != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4348 Py_ssize_t x;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4349 if (PyInt_Check(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4350 /* XXX(nnorwitz): I think PyInt_AS_LONG is correct,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4351 however, it looks like it should be AsSsize_t.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4352 There should be a comment here explaining why.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4353 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4354 x = PyInt_AS_LONG(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4355 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4356 else if (PyIndex_Check(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4357 x = PyNumber_AsSsize_t(v, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4358 if (x == -1 && PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4359 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4360 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4361 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4362 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4363 "slice indices must be integers or "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4364 "None or have an __index__ method");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4365 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4366 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4367 *pi = x;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4368 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4369 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4370 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4371
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4372 #undef ISINDEX
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39455 diff changeset	4373 #define ISINDEX(x) ((x) == NULL \|\| \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4374 PyInt_Check(x) \|\| PyLong_Check(x) \|\| PyIndex_Check(x))
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	4375
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4376 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4377 apply_slice(PyObject u, PyObject v, PyObject w) / return u[v:w] */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4378 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4379 PyTypeObject *tp = u->ob_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4380 PySequenceMethods *sq = tp->tp_as_sequence;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4381
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4382 if (sq && sq->sq_slice && ISINDEX(v) && ISINDEX(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4383 Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4384 if (!_PyEval_SliceIndex(v, &ilow))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4385 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4386 if (!_PyEval_SliceIndex(w, &ihigh))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4387 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4388 return PySequence_GetSlice(u, ilow, ihigh);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4389 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4390 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4391 PyObject *slice = PySlice_New(v, w, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4392 if (slice != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4393 PyObject *res = PyObject_GetItem(u, slice);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4394 Py_DECREF(slice);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4395 return res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4396 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4397 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4398 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4399 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4400 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	4401
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4402 static int
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4403 assign_slice(PyObject u, PyObject v, PyObject w, PyObject x)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4404 /* u[v:w] = x */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4405 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4406 PyTypeObject *tp = u->ob_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4407 PySequenceMethods *sq = tp->tp_as_sequence;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4408
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4409 if (sq && sq->sq_ass_slice && ISINDEX(v) && ISINDEX(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4410 Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4411 if (!_PyEval_SliceIndex(v, &ilow))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4412 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4413 if (!_PyEval_SliceIndex(w, &ihigh))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4414 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4415 if (x == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4416 return PySequence_DelSlice(u, ilow, ihigh);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4417 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4418 return PySequence_SetSlice(u, ilow, ihigh, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4419 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4420 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4421 PyObject *slice = PySlice_New(v, w, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4422 if (slice != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4423 int res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4424 if (x != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4425 res = PyObject_SetItem(u, slice, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4426 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4427 res = PyObject_DelItem(u, slice);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4428 Py_DECREF(slice);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4429 return res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4430 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4431 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4432 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4433 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4434 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4435
45818 ff0ab7b28f49 - Issue #2371: Add a Py3k warning when catching an exception that Guido van Rossum <guido@python.org> parents: 45703 diff changeset	4436 #define Py3kExceptionClass_Check(x) \
ff0ab7b28f49 - Issue #2371: Add a Py3k warning when catching an exception that Guido van Rossum <guido@python.org> parents: 45703 diff changeset	4437 (PyType_Check((x)) && \
ff0ab7b28f49 - Issue #2371: Add a Py3k warning when catching an exception that Guido van Rossum <guido@python.org> parents: 45703 diff changeset	4438 PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))
ff0ab7b28f49 - Issue #2371: Add a Py3k warning when catching an exception that Guido van Rossum <guido@python.org> parents: 45703 diff changeset	4439
ff0ab7b28f49 - Issue #2371: Add a Py3k warning when catching an exception that Guido van Rossum <guido@python.org> parents: 45703 diff changeset	4440 #define CANNOT_CATCH_MSG "catching classes that don't inherit from " \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4441 "BaseException is not allowed in 3.x"
45818 ff0ab7b28f49 - Issue #2371: Add a Py3k warning when catching an exception that Guido van Rossum <guido@python.org> parents: 45703 diff changeset	4442
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4443 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4444 cmp_outcome(int op, register PyObject v, register PyObject w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4445 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4446 int res = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4447 switch (op) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4448 case PyCmp_IS:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4449 res = (v == w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4450 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4451 case PyCmp_IS_NOT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4452 res = (v != w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4453 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4454 case PyCmp_IN:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4455 res = PySequence_Contains(w, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4456 if (res < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4457 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4458 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4459 case PyCmp_NOT_IN:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4460 res = PySequence_Contains(w, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4461 if (res < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4462 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4463 res = !res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4464 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4465 case PyCmp_EXC_MATCH:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4466 if (PyTuple_Check(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4467 Py_ssize_t i, length;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4468 length = PyTuple_Size(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4469 for (i = 0; i < length; i += 1) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4470 PyObject *exc = PyTuple_GET_ITEM(w, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4471 if (PyString_Check(exc)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4472 int ret_val;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4473 ret_val = PyErr_WarnEx(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4474 PyExc_DeprecationWarning,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4475 "catching of string "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4476 "exceptions is deprecated", 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4477 if (ret_val < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4478 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4479 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4480 else if (Py_Py3kWarningFlag &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4481 !PyTuple_Check(exc) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4482 !Py3kExceptionClass_Check(exc))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4483 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4484 int ret_val;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4485 ret_val = PyErr_WarnEx(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4486 PyExc_DeprecationWarning,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4487 CANNOT_CATCH_MSG, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4488 if (ret_val < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4489 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4490 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4491 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4492 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4493 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4494 if (PyString_Check(w)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4495 int ret_val;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4496 ret_val = PyErr_WarnEx(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4497 PyExc_DeprecationWarning,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4498 "catching of string "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4499 "exceptions is deprecated", 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4500 if (ret_val < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4501 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4502 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4503 else if (Py_Py3kWarningFlag &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4504 !PyTuple_Check(w) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4505 !Py3kExceptionClass_Check(w))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4506 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4507 int ret_val;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4508 ret_val = PyErr_WarnEx(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4509 PyExc_DeprecationWarning,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4510 CANNOT_CATCH_MSG, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4511 if (ret_val < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4512 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4513 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4514 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4515 res = PyErr_GivenExceptionMatches(v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4516 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4517 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4518 return PyObject_RichCompare(v, w, op);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4519 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4520 v = res ? Py_True : Py_False;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4521 Py_INCREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4522 return v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4523 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4524
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4525 static 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	4526 import_from(PyObject v, PyObject name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4527 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4528 PyObject *x;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4529
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4530 x = PyObject_GetAttr(v, name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4531 if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4532 PyErr_Format(PyExc_ImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4533 "cannot import name %.230s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4534 PyString_AsString(name));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4535 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4536 return x;
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4537 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4538
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4539 static int
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4540 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	4541 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4542 PyObject *all = PyObject_GetAttrString(v, "__all__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4543 PyObject dict, name, *value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4544 int skip_leading_underscores = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4545 int pos, err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4546
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4547 if (all == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4548 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4549 return -1; /* Unexpected error */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4550 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4551 dict = PyObject_GetAttrString(v, "__dict__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4552 if (dict == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4553 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4554 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4555 PyErr_SetString(PyExc_ImportError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4556 "from-import-* object has no __dict__ and no __all__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4557 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4558 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4559 all = PyMapping_Keys(dict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4560 Py_DECREF(dict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4561 if (all == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4562 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4563 skip_leading_underscores = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4564 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4565
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4566 for (pos = 0, err = 0; ; pos++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4567 name = PySequence_GetItem(all, pos);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4568 if (name == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4569 if (!PyErr_ExceptionMatches(PyExc_IndexError))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4570 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4571 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4572 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4573 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4574 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4575 if (skip_leading_underscores &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4576 PyString_Check(name) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4577 PyString_AS_STRING(name)[0] == '_')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4578 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4579 Py_DECREF(name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4580 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4581 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4582 value = PyObject_GetAttr(v, name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4583 if (value == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4584 err = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4585 else if (PyDict_CheckExact(locals))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4586 err = PyDict_SetItem(locals, name, value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4587 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4588 err = PyObject_SetItem(locals, name, value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4589 Py_DECREF(name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4590 Py_XDECREF(value);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4591 if (err != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4592 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4593 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4594 Py_DECREF(all);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4595 return err;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4596 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4597
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4598 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4599 build_class(PyObject methods, PyObject bases, PyObject *name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4600 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4601 PyObject metaclass = NULL, result, *base;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4602
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4603 if (PyDict_Check(methods))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4604 metaclass = PyDict_GetItemString(methods, "__metaclass__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4605 if (metaclass != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4606 Py_INCREF(metaclass);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4607 else if (PyTuple_Check(bases) && PyTuple_GET_SIZE(bases) > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4608 base = PyTuple_GET_ITEM(bases, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4609 metaclass = PyObject_GetAttrString(base, "__class__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4610 if (metaclass == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4611 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4612 metaclass = (PyObject *)base->ob_type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4613 Py_INCREF(metaclass);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4614 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4615 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4616 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4617 PyObject *g = PyEval_GetGlobals();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4618 if (g != NULL && PyDict_Check(g))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4619 metaclass = PyDict_GetItemString(g, "__metaclass__");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4620 if (metaclass == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4621 metaclass = (PyObject *) &PyClass_Type;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4622 Py_INCREF(metaclass);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4623 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4624 result = PyObject_CallFunctionObjArgs(metaclass, name, bases, methods,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4625 NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4626 Py_DECREF(metaclass);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4627 if (result == NULL && PyErr_ExceptionMatches(PyExc_TypeError)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4628 /* A type error here likely means that the user passed
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4629 in a base that was not a class (such the random module
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4630 instead of the random.random type). Help them out with
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4631 by augmenting the error message with more information.*/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4632
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4633 PyObject ptype, pvalue, *ptraceback;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4634
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4635 PyErr_Fetch(&ptype, &pvalue, &ptraceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4636 if (PyString_Check(pvalue)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4637 PyObject *newmsg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4638 newmsg = PyString_FromFormat(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4639 "Error when calling the metaclass bases\n"
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4640 " %s",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4641 PyString_AS_STRING(pvalue));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4642 if (newmsg != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4643 Py_DECREF(pvalue);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4644 pvalue = newmsg;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4645 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4646 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4647 PyErr_Restore(ptype, pvalue, ptraceback);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4648 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4649 return result;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	4650 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	4651
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4652 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4653 exec_statement(PyFrameObject f, PyObject prog, PyObject *globals,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4654 PyObject *locals)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	4655 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4656 int n;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4657 PyObject *v;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4658 int plain = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4659
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4660 if (PyTuple_Check(prog) && globals == Py_None && locals == Py_None &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4661 ((n = PyTuple_Size(prog)) == 2 \|\| n == 3)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4662 /* Backward compatibility hack */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4663 globals = PyTuple_GetItem(prog, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4664 if (n == 3)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4665 locals = PyTuple_GetItem(prog, 2);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4666 prog = PyTuple_GetItem(prog, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4667 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4668 if (globals == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4669 globals = PyEval_GetGlobals();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4670 if (locals == Py_None) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4671 locals = PyEval_GetLocals();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4672 plain = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4673 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4674 if (!globals \|\| !locals) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4675 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4676 "globals and locals cannot be NULL");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4677 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4678 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4679 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4680 else if (locals == Py_None)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4681 locals = globals;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4682 if (!PyString_Check(prog) &&
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	4683 #ifdef Py_USING_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4684 !PyUnicode_Check(prog) &&
51032 551257c8058a fix building the core with --disable-unicode Benjamin Peterson <benjamin@python.org> parents: 50936 diff changeset	4685 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4686 !PyCode_Check(prog) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4687 !PyFile_Check(prog)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4688 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4689 "exec: arg 1 must be a string, file, or code object");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4690 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4691 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4692 if (!PyDict_Check(globals)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4693 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4694 "exec: arg 2 must be a dictionary or None");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4695 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4696 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4697 if (!PyMapping_Check(locals)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4698 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4699 "exec: arg 3 must be a mapping or None");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4700 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4701 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4702 if (PyDict_GetItemString(globals, "__builtins__") == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4703 PyDict_SetItemString(globals, "__builtins__", f->f_builtins);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4704 if (PyCode_Check(prog)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4705 if (PyCode_GetNumFree((PyCodeObject *)prog) > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4706 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4707 "code object passed to exec may not contain free variables");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4708 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4709 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4710 v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4711 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4712 else if (PyFile_Check(prog)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4713 FILE *fp = PyFile_AsFile(prog);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4714 char *name = PyString_AsString(PyFile_Name(prog));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4715 PyCompilerFlags cf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4716 if (name == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4717 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4718 cf.cf_flags = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4719 if (PyEval_MergeCompilerFlags(&cf))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4720 v = PyRun_FileFlags(fp, name, Py_file_input, globals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4721 locals, &cf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4722 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4723 v = PyRun_File(fp, name, Py_file_input, globals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4724 locals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4725 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4726 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4727 PyObject *tmp = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4728 char *str;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4729 PyCompilerFlags cf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4730 cf.cf_flags = 0;
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	4731 #ifdef Py_USING_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4732 if (PyUnicode_Check(prog)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4733 tmp = PyUnicode_AsUTF8String(prog);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4734 if (tmp == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4735 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4736 prog = tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4737 cf.cf_flags \|= PyCF_SOURCE_IS_UTF8;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4738 }
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	4739 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4740 if (PyString_AsStringAndSize(prog, &str, NULL))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4741 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4742 if (PyEval_MergeCompilerFlags(&cf))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4743 v = PyRun_StringFlags(str, Py_file_input, globals,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4744 locals, &cf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4745 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4746 v = PyRun_String(str, Py_file_input, globals, locals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4747 Py_XDECREF(tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4748 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4749 if (plain)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4750 PyFrame_LocalsToFast(f, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4751 if (v == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4752 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4753 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4754 return 0;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	4755 }
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2310 diff changeset	4756
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4757 static void
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4758 format_exc_check_arg(PyObject exc, char format_str, PyObject *obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4759 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4760 char *obj_str;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4761
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4762 if (!obj)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4763 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4764
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4765 obj_str = PyString_AsString(obj);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4766 if (!obj_str)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4767 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4768
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4769 PyErr_Format(exc, format_str, obj_str);
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4770 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4771
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4772 static PyObject *
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4773 string_concatenate(PyObject v, PyObject w,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4774 PyFrameObject f, unsigned char next_instr)
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4775 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4776 /* This function implements 'variable += expr' when both arguments
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4777 are strings. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4778 Py_ssize_t v_len = PyString_GET_SIZE(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4779 Py_ssize_t w_len = PyString_GET_SIZE(w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4780 Py_ssize_t new_len = v_len + w_len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4781 if (new_len < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4782 PyErr_SetString(PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4783 "strings are too large to concat");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4784 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4785 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4786
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4787 if (v->ob_refcnt == 2) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4788 /* In the common case, there are 2 references to the value
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4789 * stored in 'variable' when the += is performed: one on the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4790 * value stack (in 'v') and one still stored in the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4791 * 'variable'. We try to delete the variable now to reduce
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4792 * the refcnt to 1.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4793 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4794 switch (*next_instr) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4795 case STORE_FAST:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4796 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4797 int oparg = PEEKARG();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4798 PyObject **fastlocals = f->f_localsplus;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4799 if (GETLOCAL(oparg) == v)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4800 SETLOCAL(oparg, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4801 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4802 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4803 case STORE_DEREF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4804 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4805 PyObject **freevars = (f->f_localsplus +
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4806 f->f_code->co_nlocals);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4807 PyObject *c = freevars[PEEKARG()];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4808 if (PyCell_GET(c) == v)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4809 PyCell_Set(c, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4810 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4811 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4812 case STORE_NAME:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4813 {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4814 PyObject *names = f->f_code->co_names;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4815 PyObject *name = GETITEM(names, PEEKARG());
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4816 PyObject *locals = f->f_locals;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4817 if (PyDict_CheckExact(locals) &&
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4818 PyDict_GetItem(locals, name) == v) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4819 if (PyDict_DelItem(locals, name) != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4820 PyErr_Clear();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4821 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4822 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4823 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4824 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4825 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4826 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4827
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4828 if (v->ob_refcnt == 1 && !PyString_CHECK_INTERNED(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4829 /* Now we own the last reference to 'v', so we can resize it
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4830 * in-place.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4831 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4832 if (_PyString_Resize(&v, new_len) != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4833 /* XXX if _PyString_Resize() fails, 'v' has been
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4834 * deallocated so it cannot be put back into
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4835 * 'variable'. The MemoryError is raised when there
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4836 * is no value in 'variable', which might (very
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4837 * remotely) be a cause of incompatibilities.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4838 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4839 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4840 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4841 /* copy 'w' into the newly allocated area of 'v' */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4842 memcpy(PyString_AS_STRING(v) + v_len,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4843 PyString_AS_STRING(w), w_len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4844 return v;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4845 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4846 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4847 /* When in-place resizing is not an option. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4848 PyString_Concat(&v, w);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4849 return v;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4850 }
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4851 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4852
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4853 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4854
38425 ca657e0bd09c needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- Fredrik Lundh <fredrik@pythonware.com> parents: 38418 diff changeset	4855 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4856 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	4857 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4858 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4859 PyObject *l = PyList_New(256);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4860 if (l == NULL) return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4861 for (i = 0; i < 256; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4862 PyObject *x = PyInt_FromLong(a[i]);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4863 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4864 Py_DECREF(l);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4865 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4866 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4867 PyList_SetItem(l, i, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4868 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4869 for (i = 0; i < 256; i++)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4870 a[i] = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4871 return l;
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4872 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4873
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4874 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4875 _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	4876 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4877 #ifndef DXPAIRS
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4878 return getarray(dxp);
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4879 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4880 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4881 PyObject *l = PyList_New(257);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4882 if (l == NULL) return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4883 for (i = 0; i < 257; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4884 PyObject *x = getarray(dxpairs[i]);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4885 if (x == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4886 Py_DECREF(l);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4887 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4888 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4889 PyList_SetItem(l, i, x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4890 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61271 diff changeset	4891 return l;
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4892 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4893 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4894
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4895 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 67415:419ca089d365 2.7