cpython-lru_cache-weakref: Objects/object.c annotate

annotate Objects/object.c @ 19814:dc87d91d0dfd legacy-trunk

Don't call MacOS.SchedParams() in MachO, it doesn't exist.

author	Jack Jansen <jack.jansen@cwi.nl>
date	Sun, 09 Sep 2001 00:36:01 +0000
parents	b7f6fbc087a7
children	f44606b242c5

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 95 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	2 /* Generic object operations; and implementation of None (NoObject) */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	4 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5
13551 15b18e0cc3fd Include macglue.h on the macintosh, so function prototypes are in scope. Jack Jansen <jack.jansen@cwi.nl> parents: 13473 diff changeset	6 #ifdef macintosh
15b18e0cc3fd Include macglue.h on the macintosh, so function prototypes are in scope. Jack Jansen <jack.jansen@cwi.nl> parents: 13473 diff changeset	7 #include "macglue.h"
15b18e0cc3fd Include macglue.h on the macintosh, so function prototypes are in scope. Jack Jansen <jack.jansen@cwi.nl> parents: 13473 diff changeset	8 #endif
15b18e0cc3fd Include macglue.h on the macintosh, so function prototypes are in scope. Jack Jansen <jack.jansen@cwi.nl> parents: 13473 diff changeset	9
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	10 /* just for trashcan: */
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	11 #include "compile.h"
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	12 #include "frameobject.h"
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	13 #include "traceback.h"
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	14
2612 ca6b60d4ea90 fix dusty debugging macros Guido van Rossum <guido@python.org> parents: 2307 diff changeset	15 #if defined( Py_TRACE_REFS ) \|\| defined( Py_REF_DEBUG )
11673 5e6e9e893acd The rest of the changes by Trent Mick and Dale Nagata for warning-free Guido van Rossum <guido@python.org> parents: 11649 diff changeset	16 DL_IMPORT(long) _Py_RefTotal;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	17 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	18
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19620 diff changeset	19 DL_IMPORT(int) Py_DivisionWarningFlag;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19620 diff changeset	20
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	21 /* Object allocation routines used by NEWOBJ and NEWVAROBJ macros.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	22 These are used by the individual routines for object creation.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	23 Do not call them otherwise, they do not initialize the object! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	25 #ifdef COUNT_ALLOCS
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	26 static PyTypeObject *type_list;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	27 extern int tuple_zero_allocs, fast_tuple_allocs;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	28 extern int quick_int_allocs, quick_neg_int_allocs;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1352 diff changeset	29 extern int null_strings, one_strings;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	30 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	31 dump_counts(void)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	32 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	33 PyTypeObject *tp;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	34
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	35 for (tp = type_list; tp; tp = tp->tp_next)
1361 7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	36 fprintf(stderr, "%s alloc'd: %d, freed: %d, max in use: %d\n",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	37 tp->tp_name, tp->tp_allocs, tp->tp_frees,
1361 7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	38 tp->tp_maxalloc);
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	39 fprintf(stderr, "fast tuple allocs: %d, empty: %d\n",
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	40 fast_tuple_allocs, tuple_zero_allocs);
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	41 fprintf(stderr, "fast int allocs: pos: %d, neg: %d\n",
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	42 quick_int_allocs, quick_neg_int_allocs);
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	43 fprintf(stderr, "null strings: %d, 1-strings: %d\n",
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	44 null_strings, one_strings);
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	45 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	46
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	47 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	48 get_counts(void)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	49 {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	50 PyTypeObject *tp;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	51 PyObject *result;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	52 PyObject *v;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	53
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	54 result = PyList_New(0);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	55 if (result == NULL)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	56 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	57 for (tp = type_list; tp; tp = tp->tp_next) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	58 v = Py_BuildValue("(siii)", tp->tp_name, tp->tp_allocs,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	59 tp->tp_frees, tp->tp_maxalloc);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	60 if (v == NULL) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	61 Py_DECREF(result);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	62 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	63 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	64 if (PyList_Append(result, v) < 0) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	65 Py_DECREF(v);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	66 Py_DECREF(result);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	67 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	68 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	69 Py_DECREF(v);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	70 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	71 return result;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	72 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	73
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	74 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	75 inc_count(PyTypeObject *tp)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	76 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	77 if (tp->tp_allocs == 0) {
2639 f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	78 /* first time; insert in linked list */
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	79 if (tp->tp_next != NULL) /* sanity check */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	80 Py_FatalError("XXX inc_count sanity check");
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	81 tp->tp_next = type_list;
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	82 type_list = tp;
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	83 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	84 tp->tp_allocs++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	85 if (tp->tp_allocs - tp->tp_frees > tp->tp_maxalloc)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	86 tp->tp_maxalloc = tp->tp_allocs - tp->tp_frees;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	87 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	88 #endif
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	89
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	90 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	91 PyObject_Init(PyObject op, PyTypeObject tp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	92 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	93 if (op == NULL) {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	94 PyErr_SetString(PyExc_SystemError,
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	95 "NULL object passed to PyObject_Init");
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	96 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	97 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	98 /* Any changes should be reflected in PyObject_INIT (objimpl.h) */
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	99 op->ob_type = tp;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	100 _Py_NewReference(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	101 return op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	102 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	104 PyVarObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	105 PyObject_InitVar(PyVarObject op, PyTypeObject tp, int size)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	106 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	107 if (op == NULL) {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	108 PyErr_SetString(PyExc_SystemError,
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	109 "NULL object passed to PyObject_InitVar");
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	110 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	111 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	112 /* Any changes should be reflected in PyObject_INIT_VAR */
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	113 op->ob_size = size;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	114 op->ob_type = tp;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	115 _Py_NewReference((PyObject *)op);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	116 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	117 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	118
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	119 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	120 _PyObject_New(PyTypeObject *tp)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	121 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	122 PyObject *op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	123 op = (PyObject *) PyObject_MALLOC(_PyObject_SIZE(tp));
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	124 if (op == NULL)
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	125 return PyErr_NoMemory();
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	126 return PyObject_INIT(op, tp);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	127 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	128
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	129 PyVarObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	130 _PyObject_NewVar(PyTypeObject *tp, int size)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	131 {
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	132 PyVarObject *op;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	133 op = (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE(tp, size));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	134 if (op == NULL)
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	135 return (PyVarObject *)PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	136 return PyObject_INIT_VAR(op, tp, size);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	137 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	138
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	139 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	140 _PyObject_Del(PyObject *op)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	141 {
13265 e8bb0d536633 Neil Schemenauer: small fixes for GC Guido van Rossum <guido@python.org> parents: 13256 diff changeset	142 PyObject_FREE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	143 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	144
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	145 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	146 PyObject_Print(PyObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	147 {
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	148 int ret = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	149 if (PyErr_CheckSignals())
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	150 return -1;
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	151 #ifdef USE_STACKCHECK
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	152 if (PyOS_CheckStack()) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	153 PyErr_SetString(PyExc_MemoryError, "stack overflow");
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	154 return -1;
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	155 }
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	156 #endif
11649 38560a3a3249 On Linux, one sometimes sees spurious errors after interrupting Guido van Rossum <guido@python.org> parents: 8695 diff changeset	157 clearerr(fp); /* Clear any previous error condition */
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	158 if (op == NULL) {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	159 fprintf(fp, "<nil>");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	160 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	161 else {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	162 if (op->ob_refcnt <= 0)
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	163 fprintf(fp, "<refcnt %u at %p>",
ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	164 op->ob_refcnt, op);
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	165 else if (op->ob_type->tp_print == NULL) {
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	166 PyObject *s;
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	167 if (flags & Py_PRINT_RAW)
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	168 s = PyObject_Str(op);
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	169 else
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	170 s = PyObject_Repr(op);
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	171 if (s == NULL)
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	172 ret = -1;
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	173 else {
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	174 ret = PyObject_Print(s, fp, Py_PRINT_RAW);
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	175 }
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	176 Py_XDECREF(s);
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	177 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	178 else
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	179 ret = (*op->ob_type->tp_print)(op, fp, flags);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	180 }
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	181 if (ret == 0) {
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	182 if (ferror(fp)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	183 PyErr_SetFromErrno(PyExc_IOError);
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	184 clearerr(fp);
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	185 ret = -1;
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	186 }
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	187 }
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	188 return ret;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	189 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	190
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	191 /* For debugging convenience. See Misc/gdbinit for some useful gdb hooks */
16197 1bb7651683e7 PyObject_Dump() -> _PyObject_Dump() Barry Warsaw <barry@python.org> parents: 16167 diff changeset	192 void _PyObject_Dump(PyObject* op)
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	193 {
16742 db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	194 if (op == NULL)
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	195 fprintf(stderr, "NULL\n");
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	196 else {
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	197 (void)PyObject_Print(op, stderr, 0);
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	198 fprintf(stderr, "\nrefcounts: %d\n", op->ob_refcnt);
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	199 fprintf(stderr, "address : %p\n", op);
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	200 }
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	201 }
16167 71ceaba3f615 PyObject_Dump(): Use %p format to print the address of the pointer. Barry Warsaw <barry@python.org> parents: 16165 diff changeset	202
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	203 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	204 PyObject_Repr(PyObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	205 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	206 if (PyErr_CheckSignals())
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	207 return NULL;
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	208 #ifdef USE_STACKCHECK
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	209 if (PyOS_CheckStack()) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	210 PyErr_SetString(PyExc_MemoryError, "stack overflow");
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	211 return NULL;
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	212 }
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	213 #endif
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	214 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	215 return PyString_FromString("<NULL>");
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19343 diff changeset	216 else if (v->ob_type->tp_repr == NULL)
19620 b706c027c3c0 PyObject_Repr(): add missing ">" back at end of format string: "<%s Guido van Rossum <guido@python.org> parents: 19580 diff changeset	217 return PyString_FromFormat("<%s object at %p>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19343 diff changeset	218 v->ob_type->tp_name, v);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	219 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	220 PyObject *res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	221 res = (*v->ob_type->tp_repr)(v);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	222 if (res == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	223 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	224 #ifdef Py_USING_UNICODE
13293 e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	225 if (PyUnicode_Check(res)) {
e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	226 PyObject* str;
13436 bc9e22ad5c46 - changed __repr__ to use "unicode escape" encoding for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 13432 diff changeset	227 str = PyUnicode_AsUnicodeEscapeString(res);
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	228 Py_DECREF(res);
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	229 if (str)
13293 e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	230 res = str;
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	231 else
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	232 return NULL;
13293 e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	233 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	234 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	235 if (!PyString_Check(res)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	236 PyErr_Format(PyExc_TypeError,
12320 5de0b939fe61 Skip Montanaro: add string precisions to calls to PyErr_Format Guido van Rossum <guido@python.org> parents: 12052 diff changeset	237 "__repr__ returned non-string (type %.200s)",
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	238 res->ob_type->tp_name);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	239 Py_DECREF(res);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	240 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	241 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	242 return res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	243 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	244 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	245
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	246 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	247 PyObject_Str(PyObject *v)
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	248 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	249 PyObject *res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	250
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	251 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	252 return PyString_FromString("<NULL>");
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	253 if (PyString_Check(v)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	254 Py_INCREF(v);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	255 return v;
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	256 }
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	257 if (v->ob_type->tp_str == NULL)
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	258 return PyObject_Repr(v);
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	259
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	260 res = (*v->ob_type->tp_str)(v);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	261 if (res == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	262 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	263 #ifdef Py_USING_UNICODE
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	264 if (PyUnicode_Check(res)) {
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	265 PyObject* str;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	266 str = PyUnicode_AsEncodedString(res, NULL, NULL);
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	267 Py_DECREF(res);
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	268 if (str)
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	269 res = str;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	270 else
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	271 return NULL;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	272 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	273 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	274 if (!PyString_Check(res)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	275 PyErr_Format(PyExc_TypeError,
12320 5de0b939fe61 Skip Montanaro: add string precisions to calls to PyErr_Format Guido van Rossum <guido@python.org> parents: 12052 diff changeset	276 "__str__ returned non-string (type %.200s)",
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	277 res->ob_type->tp_name);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	278 Py_DECREF(res);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	279 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	280 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	281 return res;
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	282 }
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	283
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	284 #ifdef Py_USING_UNICODE
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	285 PyObject *
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	286 PyObject_Unicode(PyObject *v)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	287 {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	288 PyObject *res;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	289
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	290 if (v == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	291 res = PyString_FromString("<NULL>");
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	292 else if (PyUnicode_Check(v)) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	293 Py_INCREF(v);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	294 return v;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	295 }
17220 b60096d5001a Fixed ref count bug. Patch #411191. Found by Walter Dörwald. Marc-André Lemburg <mal@egenix.com> parents: 16782 diff changeset	296 else if (PyString_Check(v)) {
b60096d5001a Fixed ref count bug. Patch #411191. Found by Walter Dörwald. Marc-André Lemburg <mal@egenix.com> parents: 16782 diff changeset	297 Py_INCREF(v);
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	298 res = v;
17220 b60096d5001a Fixed ref count bug. Patch #411191. Found by Walter Dörwald. Marc-André Lemburg <mal@egenix.com> parents: 16782 diff changeset	299 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	300 else if (v->ob_type->tp_str != NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	301 res = (*v->ob_type->tp_str)(v);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	302 else {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	303 PyObject *func;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	304 static PyObject *strstr;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	305 if (strstr == NULL) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	306 strstr= PyString_InternFromString("__str__");
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	307 if (strstr == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	308 return NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	309 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	310 if (!PyInstance_Check(v) \|\|
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	311 (func = PyObject_GetAttr(v, strstr)) == NULL) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	312 PyErr_Clear();
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	313 res = PyObject_Repr(v);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	314 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	315 else {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	316 res = PyEval_CallObject(func, (PyObject *)NULL);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	317 Py_DECREF(func);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	318 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	319 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	320 if (res == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	321 return NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	322 if (!PyUnicode_Check(res)) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	323 PyObject* str;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	324 str = PyUnicode_FromObject(res);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	325 Py_DECREF(res);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	326 if (str)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	327 res = str;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	328 else
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	329 return NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	330 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	331 return res;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	332 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	333 #endif
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	334
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	335
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	336 /* Macro to get the tp_richcompare field of a type if defined */
e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	337 #define RICHCOMPARE(t) (PyType_HasFeature((t), Py_TPFLAGS_HAVE_RICHCOMPARE) \
e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	338 ? (t)->tp_richcompare : NULL)
e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	339
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	340 /* Map rich comparison operators to their swapped version, e.g. LT --> GT */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	341 static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	342
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	343 /* Try a genuine rich comparison, returning an object. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	344 NULL for exception;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	345 NotImplemented if this particular rich comparison is not implemented or
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	346 undefined;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	347 some object not equal to NotImplemented if it is implemented
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	348 (this latter object may not be a Boolean).
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	349 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	350 static PyObject *
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	351 try_rich_compare(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	352 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	353 richcmpfunc f;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	354 PyObject *res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	355
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	356 if ((f = RICHCOMPARE(v->ob_type)) != NULL) {
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	357 res = (*f)(v, w, op);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	358 if (res != Py_NotImplemented)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	359 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	360 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	361 }
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	362 if ((f = RICHCOMPARE(w->ob_type)) != NULL) {
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	363 return (*f)(w, v, swapped_op[op]);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	364 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	365 res = Py_NotImplemented;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	366 Py_INCREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	367 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	368 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	369
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	370 /* Try a genuine rich comparison, returning an int. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	371 -1 for exception (including the case where try_rich_compare() returns an
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	372 object that's not a Boolean);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	373 0 if the outcome is false;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	374 1 if the outcome is true;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	375 2 if this particular rich comparison is not implemented or undefined.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	376 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	377 static int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	378 try_rich_compare_bool(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	379 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	380 PyObject *res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	381 int ok;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	382
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	383 if (RICHCOMPARE(v->ob_type) == NULL && RICHCOMPARE(w->ob_type) == NULL)
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	384 return 2; /* Shortcut, avoid INCREF+DECREF */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	385 res = try_rich_compare(v, w, op);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	386 if (res == NULL)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	387 return -1;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	388 if (res == Py_NotImplemented) {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	389 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	390 return 2;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	391 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	392 ok = PyObject_IsTrue(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	393 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	394 return ok;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	395 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	396
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	397 /* Try rich comparisons to determine a 3-way comparison. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	398 -2 for an exception;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	399 -1 if v < w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	400 0 if v == w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	401 1 if v > w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	402 2 if this particular rich comparison is not implemented or undefined.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	403 */
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	404 static int
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	405 try_rich_to_3way_compare(PyObject v, PyObject w)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	406 {
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	407 static struct { int op; int outcome; } tries[3] = {
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	408 /* Try this operator, and if it is true, use this outcome: */
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	409 {Py_EQ, 0},
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	410 {Py_LT, -1},
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	411 {Py_GT, 1},
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	412 };
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	413 int i;
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	414
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	415 if (RICHCOMPARE(v->ob_type) == NULL && RICHCOMPARE(w->ob_type) == NULL)
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	416 return 2; /* Shortcut */
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	417
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	418 for (i = 0; i < 3; i++) {
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	419 switch (try_rich_compare_bool(v, w, tries[i].op)) {
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	420 case -1:
17698 aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	421 return -2;
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	422 case 1:
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	423 return tries[i].outcome;
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	424 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	425 }
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	426
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	427 return 2;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	428 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	429
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	430 /* Try a 3-way comparison, returning an int. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	431 -2 for an exception;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	432 -1 if v < w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	433 0 if v == w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	434 1 if v > w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	435 2 if this particular 3-way comparison is not implemented or undefined.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	436 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	437 static int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	438 try_3way_compare(PyObject v, PyObject w)
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	439 {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	440 int c;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	441 cmpfunc f;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	442
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	443 /* Comparisons involving instances are given to instance_compare,
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	444 which has the same return conventions as this function. */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	445
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	446 if (PyInstance_Check(v))
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	447 return (*v->ob_type->tp_compare)(v, w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	448 if (PyInstance_Check(w))
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	449 return (*w->ob_type->tp_compare)(v, w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	450
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	451 /* Try coercion; if it fails, give up */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	452 c = PyNumber_CoerceEx(&v, &w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	453 if (c < 0)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	454 return -2;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	455 if (c > 0)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	456 return 2;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	457
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	458 /* Try v's comparison, if defined */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	459 if ((f = v->ob_type->tp_compare) != NULL) {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	460 c = (*f)(v, w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	461 Py_DECREF(v);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	462 Py_DECREF(w);
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	463 if (c < 0 && PyErr_Occurred())
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	464 return -2;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	465 return c < 0 ? -1 : c > 0 ? 1 : 0;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	466 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	467
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	468 /* Try w's comparison, if defined */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	469 if ((f = w->ob_type->tp_compare) != NULL) {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	470 c = (f)(w, v); / swapped! */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	471 Py_DECREF(v);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	472 Py_DECREF(w);
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	473 if (c < 0 && PyErr_Occurred())
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	474 return -2;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	475 return c < 0 ? 1 : c > 0 ? -1 : 0; /* negated! */
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	476 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	477
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	478 /* No comparison defined */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	479 Py_DECREF(v);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	480 Py_DECREF(w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	481 return 2;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	482 }
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	483
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	484 /* Final fallback 3-way comparison, returning an int. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	485 -2 if an error occurred;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	486 -1 if v < w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	487 0 if v == w;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	488 1 if v > w.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	489 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	490 static int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	491 default_3way_compare(PyObject v, PyObject w)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	492 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	493 int c;
16108 28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	494 char vname, wname;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	495
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	496 if (v->ob_type == w->ob_type) {
16062 afc6f1137ea4 Tim chastens: Barry Warsaw <barry@python.org> parents: 16061 diff changeset	497 /* When comparing these pointers, they must be cast to
afc6f1137ea4 Tim chastens: Barry Warsaw <barry@python.org> parents: 16061 diff changeset	498 * integer types (i.e. Py_uintptr_t, our spelling of C9X's
afc6f1137ea4 Tim chastens: Barry Warsaw <barry@python.org> parents: 16061 diff changeset	499 * uintptr_t). ANSI specifies that pointer compares other
afc6f1137ea4 Tim chastens: Barry Warsaw <barry@python.org> parents: 16061 diff changeset	500 * than == and != to non-related structures are undefined.
afc6f1137ea4 Tim chastens: Barry Warsaw <barry@python.org> parents: 16061 diff changeset	501 */
16061 6b647a5d5b7e default_3way_compare(): When comparing the pointers, they must be cast Barry Warsaw <barry@python.org> parents: 16002 diff changeset	502 Py_uintptr_t vv = (Py_uintptr_t)v;
6b647a5d5b7e default_3way_compare(): When comparing the pointers, they must be cast Barry Warsaw <barry@python.org> parents: 16002 diff changeset	503 Py_uintptr_t ww = (Py_uintptr_t)w;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	504 return (vv < ww) ? -1 : (vv > ww) ? 1 : 0;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	505 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	506
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	507 #ifdef Py_USING_UNICODE
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	508 /* Special case for Unicode */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	509 if (PyUnicode_Check(v) \|\| PyUnicode_Check(w)) {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	510 c = PyUnicode_Compare(v, w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	511 if (!PyErr_Occurred())
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	512 return c;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	513 /* TypeErrors are ignored: if Unicode coercion fails due
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	514 to one of the arguments not having the right type, we
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	515 continue as defined by the coercion protocol (see
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	516 above). Luckily, decoding errors are reported as
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	517 ValueErrors and are not masked by this technique. */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	518 if (!PyErr_ExceptionMatches(PyExc_TypeError))
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	519 return -2;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	520 PyErr_Clear();
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	521 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	522 #endif
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	523
16123 f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	524 /* None is smaller than anything */
f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	525 if (v == Py_None)
f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	526 return -1;
f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	527 if (w == Py_None)
f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	528 return 1;
f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	529
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	530 /* different type: compare type names */
16108 28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	531 if (v->ob_type->tp_as_number)
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	532 vname = "";
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	533 else
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	534 vname = v->ob_type->tp_name;
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	535 if (w->ob_type->tp_as_number)
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	536 wname = "";
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	537 else
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	538 wname = w->ob_type->tp_name;
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	539 c = strcmp(vname, wname);
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	540 if (c < 0)
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	541 return -1;
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	542 if (c > 0)
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	543 return 1;
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	544 /* Same type name, or (more likely) incomparable numeric types */
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	545 return ((Py_uintptr_t)(v->ob_type) < (
28d8ccbe237f Once again, numeric-smelling objects compare smaller than non-numeric Guido van Rossum <guido@python.org> parents: 16079 diff changeset	546 Py_uintptr_t)(w->ob_type)) ? -1 : 1;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	547 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	548
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	549 #define CHECK_TYPES(o) PyType_HasFeature((o)->ob_type, Py_TPFLAGS_CHECKTYPES)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	550
17698 aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	551 /* Do a 3-way comparison, by hook or by crook. Return:
aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	552 -2 for an exception;
aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	553 -1 if v < w;
aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	554 0 if v == w;
aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	555 1 if v > w;
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	556 If the object implements a tp_compare function, it returns
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	557 whatever this function returns (whether with an exception or not).
17698 aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	558 */
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	559 static int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	560 do_cmp(PyObject v, PyObject w)
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	561 {
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	562 int c;
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	563 cmpfunc f;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	564
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	565 if (v->ob_type == w->ob_type
19293 1e87db0ca248 Update to MvL's patch #424475 to avoid returning 2 when tp_compare Guido van Rossum <guido@python.org> parents: 19040 diff changeset	566 && (f = v->ob_type->tp_compare) != NULL) {
1e87db0ca248 Update to MvL's patch #424475 to avoid returning 2 when tp_compare Guido van Rossum <guido@python.org> parents: 19040 diff changeset	567 c = (*f)(v, w);
1e87db0ca248 Update to MvL's patch #424475 to avoid returning 2 when tp_compare Guido van Rossum <guido@python.org> parents: 19040 diff changeset	568 if (c != 2 \|\| !PyInstance_Check(v))
1e87db0ca248 Update to MvL's patch #424475 to avoid returning 2 when tp_compare Guido van Rossum <guido@python.org> parents: 19040 diff changeset	569 return c;
1e87db0ca248 Update to MvL's patch #424475 to avoid returning 2 when tp_compare Guido van Rossum <guido@python.org> parents: 19040 diff changeset	570 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	571 c = try_rich_to_3way_compare(v, w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	572 if (c < 2)
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	573 return c;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	574 c = try_3way_compare(v, w);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	575 if (c < 2)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	576 return c;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	577 return default_3way_compare(v, w);
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	578 }
36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	579
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	580 /* compare_nesting is incremented before calling compare (for
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	581 some types) and decremented on exit. If the count exceeds the
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	582 nesting limit, enable code to detect circular data structures.
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	583
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	584 This is a tunable parameter that should only affect the performance
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	585 of comparisons, nothing else. Setting it high makes comparing deeply
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	586 nested non-cyclical data structures faster, but makes comparing cyclical
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	587 data structures slower.
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	588 */
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	589 #define NESTING_LIMIT 20
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	590
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	591 static int compare_nesting = 0;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	592
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	593 static PyObject*
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	594 get_inprogress_dict(void)
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	595 {
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	596 static PyObject *key;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	597 PyObject tstate_dict, inprogress;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	598
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	599 if (key == NULL) {
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	600 key = PyString_InternFromString("cmp_state");
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	601 if (key == NULL)
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	602 return NULL;
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	603 }
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	604
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	605 tstate_dict = PyThreadState_GetDict();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	606 if (tstate_dict == NULL) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	607 PyErr_BadInternalCall();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	608 return NULL;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	609 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	610
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	611 inprogress = PyDict_GetItem(tstate_dict, key);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	612 if (inprogress == NULL) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	613 inprogress = PyDict_New();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	614 if (inprogress == NULL)
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	615 return NULL;
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	616 if (PyDict_SetItem(tstate_dict, key, inprogress) == -1) {
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	617 Py_DECREF(inprogress);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	618 return NULL;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	619 }
12904 752aa8dff520 the PyDict_SetItem does not borrow a reference, so we need to decref Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	620 Py_DECREF(inprogress);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	621 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	622
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	623 return inprogress;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	624 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	625
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	626 static PyObject *
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	627 check_recursion(PyObject v, PyObject w, int op)
15952 1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	628 {
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	629 PyObject *inprogress;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	630 PyObject *token;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	631 Py_uintptr_t iv = (Py_uintptr_t)v;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	632 Py_uintptr_t iw = (Py_uintptr_t)w;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	633 PyObject x, y, *z;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	634
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	635 inprogress = get_inprogress_dict();
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	636 if (inprogress == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	637 return NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	638
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	639 token = PyTuple_New(3);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	640 if (token == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	641 return NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	642
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	643 if (iv <= iw) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	644 PyTuple_SET_ITEM(token, 0, x = PyLong_FromVoidPtr((void *)v));
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	645 PyTuple_SET_ITEM(token, 1, y = PyLong_FromVoidPtr((void *)w));
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	646 if (op >= 0)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	647 op = swapped_op[op];
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	648 } else {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	649 PyTuple_SET_ITEM(token, 0, x = PyLong_FromVoidPtr((void *)w));
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	650 PyTuple_SET_ITEM(token, 1, y = PyLong_FromVoidPtr((void *)v));
15952 1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	651 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	652 PyTuple_SET_ITEM(token, 2, z = PyInt_FromLong((long)op));
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	653 if (x == NULL \|\| y == NULL \|\| z == NULL) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	654 Py_DECREF(token);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	655 return NULL;
15952 1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	656 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	657
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	658 if (PyDict_GetItem(inprogress, token) != NULL) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	659 Py_DECREF(token);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	660 return Py_None; /* Without INCREF! */
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	661 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	662
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	663 if (PyDict_SetItem(inprogress, token, token) < 0) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	664 Py_DECREF(token);
15952 1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	665 return NULL;
1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	666 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	667
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	668 return token;
15952 1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	669 }
1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15941 diff changeset	670
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	671 static void
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	672 delete_token(PyObject *token)
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	673 {
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	674 PyObject *inprogress;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	675
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	676 if (token == NULL \|\| token == Py_None)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	677 return;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	678 inprogress = get_inprogress_dict();
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	679 if (inprogress == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	680 PyErr_Clear();
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	681 else
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	682 PyDict_DelItem(inprogress, token);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	683 Py_DECREF(token);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	684 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	685
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	686 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	687 PyObject_Compare(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	688 {
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	689 PyTypeObject *vtp;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	690 int result;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	691
14126 41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	692 #if defined(USE_STACKCHECK)
14265 1f76fc98b4c8 PyOS_CheckStack() returns 1 when failing, not -1. Guido van Rossum <guido@python.org> parents: 14126 diff changeset	693 if (PyOS_CheckStack()) {
14126 41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	694 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	695 return -1;
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	696 }
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	697 #endif
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	698 if (v == NULL \|\| w == NULL) {
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	699 PyErr_BadInternalCall();
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	700 return -1;
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	701 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	702 if (v == w)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	703 return 0;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	704 vtp = v->ob_type;
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	705 compare_nesting++;
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	706 if (compare_nesting > NESTING_LIMIT &&
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	707 (vtp->tp_as_mapping
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	708 \|\| (vtp->tp_as_sequence
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	709 && !PyString_Check(v)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	710 && !PyTuple_Check(v)))) {
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	711 /* try to detect circular data structures */
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	712 PyObject *token = check_recursion(v, w, -1);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	713
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	714 if (token == NULL) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	715 result = -1;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	716 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	717 else if (token == Py_None) {
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	718 /* already comparing these objects. assume
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	719 they're equal until shown otherwise */
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	720 result = 0;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	721 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	722 else {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	723 result = do_cmp(v, w);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	724 delete_token(token);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	725 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	726 }
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	727 else {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	728 result = do_cmp(v, w);
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	729 }
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	730 compare_nesting--;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	731 return result < 0 ? -1 : result;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	732 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	733
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	734 static PyObject *
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	735 convert_3way_to_object(int op, int c)
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	736 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	737 PyObject *result;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	738 switch (op) {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	739 case Py_LT: c = c < 0; break;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	740 case Py_LE: c = c <= 0; break;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	741 case Py_EQ: c = c == 0; break;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	742 case Py_NE: c = c != 0; break;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	743 case Py_GT: c = c > 0; break;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	744 case Py_GE: c = c >= 0; break;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	745 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	746 result = c ? Py_True : Py_False;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	747 Py_INCREF(result);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	748 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	749 }
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	750
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	751
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	752 static PyObject *
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	753 try_3way_to_rich_compare(PyObject v, PyObject w, int op)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	754 {
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	755 int c;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	756
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	757 c = try_3way_compare(v, w);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	758 if (c >= 2)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	759 c = default_3way_compare(v, w);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	760 if (c <= -2)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	761 return NULL;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	762 return convert_3way_to_object(op, c);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	763 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	764
16079 c4355905b044 Remove a smelly export. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 16062 diff changeset	765 static PyObject *
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	766 do_richcmp(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	767 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	768 PyObject *res;
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	769 cmpfunc f;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	770
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	771 /* If the types are equal, don't bother with coercions etc.
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	772 Instances are special-cased in try_3way_compare, since
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	773 a result of 2 does not mean one value being greater
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	774 than the other. */
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	775 if (v->ob_type == w->ob_type
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	776 && (f = v->ob_type->tp_compare) != NULL
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	777 && !PyInstance_Check(v)) {
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	778 int c;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	779 richcmpfunc f1;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	780 if ((f1 = RICHCOMPARE(v->ob_type)) != NULL) {
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	781 /* If the type has richcmp, try it first.
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	782 try_rich_compare would try it two-sided,
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	783 which is not needed since we've a single
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	784 type only. */
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	785 res = (*f1)(v, w, op);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	786 if (res != Py_NotImplemented)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	787 return res;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	788 Py_DECREF(res);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	789 }
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	790 c = (*f)(v, w);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	791 if (c < 0 && PyErr_Occurred())
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	792 return NULL;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	793 return convert_3way_to_object(op, c);
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	794 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	795
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	796 res = try_rich_compare(v, w, op);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	797 if (res != Py_NotImplemented)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	798 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	799 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	800
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	801 return try_3way_to_rich_compare(v, w, op);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	802 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	803
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	804 PyObject *
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	805 PyObject_RichCompare(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	806 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	807 PyObject *res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	808
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	809 assert(Py_LT <= op && op <= Py_GE);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	810
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	811 compare_nesting++;
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	812 if (compare_nesting > NESTING_LIMIT &&
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	813 (v->ob_type->tp_as_mapping
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	814 \|\| (v->ob_type->tp_as_sequence
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	815 && !PyString_Check(v)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	816 && !PyTuple_Check(v)))) {
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	817 /* try to detect circular data structures */
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	818 PyObject *token = check_recursion(v, w, op);
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	819
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	820 if (token == NULL) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	821 res = NULL;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	822 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	823 else if (token == Py_None) {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	824 /* already comparing these objects with this operator.
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	825 assume they're equal until shown otherwise */
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	826 if (op == Py_EQ)
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	827 res = Py_True;
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	828 else if (op == Py_NE)
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	829 res = Py_False;
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	830 else {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	831 PyErr_SetString(PyExc_ValueError,
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	832 "can't order recursive values");
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	833 res = NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	834 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	835 Py_XINCREF(res);
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	836 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	837 else {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	838 res = do_richcmp(v, w, op);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	839 delete_token(token);
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	840 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	841 }
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	842 else {
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	843 res = do_richcmp(v, w, op);
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	844 }
f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	845 compare_nesting--;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	846 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	847 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	848
17688 1ebb4e566257 Make 'x in y' and 'x not in y' (PySequence_Contains) play nice w/ iterators. Tim Peters <tim.peters@gmail.com> parents: 17673 diff changeset	849 /* Return -1 if error; 1 if v op w; 0 if not (v op w). */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	850 int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	851 PyObject_RichCompareBool(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	852 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	853 PyObject *res = PyObject_RichCompare(v, w, op);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	854 int ok;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	855
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	856 if (res == NULL)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	857 return -1;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	858 ok = PyObject_IsTrue(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	859 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	860 return ok;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	861 }
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	862
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	863 /* Set of hash utility functions to help maintaining the invariant that
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	864 iff a==b then hash(a)==hash(b)
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	865
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	866 All the utility functions (_Py_Hash*()) return "-1" to signify an error.
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	867 */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	868
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	869 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	870 _Py_HashDouble(double v)
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	871 {
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	872 double intpart, fractpart;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	873 int expo;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	874 long hipart;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	875 long x; /* the final hash value */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	876 /* This is designed so that Python numbers of different types
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	877 * that compare equal hash to the same value; otherwise comparisons
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	878 * of mapping keys will turn out weird.
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	879 */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	880
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	881 #ifdef MPW /* MPW C modf expects pointer to extended as second argument */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	882 {
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	883 extended e;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	884 fractpart = modf(v, &e);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	885 intpart = e;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	886 }
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	887 #else
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	888 fractpart = modf(v, &intpart);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	889 #endif
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	890 if (fractpart == 0.0) {
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	891 /* This must return the same hash as an equal int or long. */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	892 if (intpart > LONG_MAX \|\| -intpart > LONG_MAX) {
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	893 /* Convert to long and use its hash. */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	894 PyObject plong; / converted to Python long */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	895 if (Py_IS_INFINITY(intpart))
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	896 /* can't convert to long int -- arbitrary */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	897 v = v < 0 ? -271828.0 : 314159.0;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	898 plong = PyLong_FromDouble(v);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	899 if (plong == NULL)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	900 return -1;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	901 x = PyObject_Hash(plong);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	902 Py_DECREF(plong);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	903 return x;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	904 }
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	905 /* Fits in a C long == a Python int, so is its own hash. */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	906 x = (long)intpart;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	907 if (x == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	908 x = -2;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	909 return x;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	910 }
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	911 /* The fractional part is non-zero, so we don't have to worry about
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	912 * making this match the hash of some other type.
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	913 * Use frexp to get at the bits in the double.
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	914 * Since the VAX D double format has 56 mantissa bits, which is the
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	915 * most of any double format in use, each of these parts may have as
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	916 * many as (but no more than) 56 significant bits.
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	917 * So, assuming sizeof(long) >= 4, each part can be broken into two
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	918 * longs; frexp and multiplication are used to do that.
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	919 * Also, since the Cray double format has 15 exponent bits, which is
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	920 * the most of any double format in use, shifting the exponent field
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	921 * left by 15 won't overflow a long (again assuming sizeof(long) >= 4).
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	922 */
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	923 v = frexp(v, &expo);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	924 v = 2147483648.0; / 2*31 /
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	925 hipart = (long)v; /* take the top 32 bits */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	926 v = (v - (double)hipart) * 2147483648.0; /* get the next 32 bits */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	927 x = hipart + (long)v + (expo << 15);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	928 if (x == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	929 x = -2;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	930 return x;
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	931 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	932
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	933 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	934 _Py_HashPointer(void *p)
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	935 {
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	936 #if SIZEOF_LONG >= SIZEOF_VOID_P
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	937 return (long)p;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	938 #else
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	939 /* convert to a Python long and hash that */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	940 PyObject* longobj;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	941 long x;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	942
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	943 if ((longobj = PyLong_FromVoidPtr(p)) == NULL) {
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	944 x = -1;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	945 goto finally;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	946 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	947 x = PyObject_Hash(longobj);
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	948
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	949 finally:
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	950 Py_XDECREF(longobj);
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	951 return x;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	952 #endif
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	953 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	954
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	955
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	956 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	957 PyObject_Hash(PyObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	958 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	959 PyTypeObject *tp = v->ob_type;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	960 if (tp->tp_hash != NULL)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	961 return (*tp->tp_hash)(v);
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	962 if (tp->tp_compare == NULL && RICHCOMPARE(tp) == NULL) {
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	963 return _Py_HashPointer(v); /* Use address as hash value */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	964 }
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	965 /* If there's a cmp but no hash defined, the object can't be hashed */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	966 PyErr_SetString(PyExc_TypeError, "unhashable type");
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	967 return -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	968 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	969
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	970 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	971 PyObject_GetAttrString(PyObject v, char name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	972 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	973 PyObject w, res;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	974
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	975 if (v->ob_type->tp_getattr != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	976 return (*v->ob_type->tp_getattr)(v, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	977 w = PyString_InternFromString(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	978 if (w == NULL)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	979 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	980 res = PyObject_GetAttr(v, w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	981 Py_XDECREF(w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	982 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	983 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	984
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	985 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	986 PyObject_HasAttrString(PyObject v, char name)
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	987 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	988 PyObject *res = PyObject_GetAttrString(v, name);
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	989 if (res != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	990 Py_DECREF(res);
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	991 return 1;
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	992 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	993 PyErr_Clear();
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	994 return 0;
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	995 }
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	996
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	997 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	998 PyObject_SetAttrString(PyObject v, char name, PyObject *w)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	999 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1000 PyObject *s;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1001 int res;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	1002
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1003 if (v->ob_type->tp_setattr != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1004 return (*v->ob_type->tp_setattr)(v, name, w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1005 s = PyString_InternFromString(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1006 if (s == NULL)
95 a5bf7d5959ce Return -1 for errors. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1007 return -1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1008 res = PyObject_SetAttr(v, s, w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1009 Py_XDECREF(s);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1010 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1011 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1012
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1013 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1014 PyObject_GetAttr(PyObject v, PyObject name)
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1015 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1016 PyTypeObject *tp = v->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1017
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1018 #ifdef Py_USING_UNICODE
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1019 /* The Unicode to string conversion is done here because the
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1020 existing tp_getattro slots expect a string object as name
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1021 and we wouldn't want to break those. */
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1022 if (PyUnicode_Check(name)) {
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1023 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1024 if (name == NULL)
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1025 return NULL;
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1026 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1027 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1028
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1029 if (!PyString_Check(name)) {
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1030 PyErr_SetString(PyExc_TypeError,
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1031 "attribute name must be string");
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1032 return NULL;
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1033 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1034 if (tp->tp_getattro != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1035 return (*tp->tp_getattro)(v, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1036 if (tp->tp_getattr != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1037 return (*tp->tp_getattr)(v, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1038 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1039 "'%.50s' object has no attribute '%.400s'",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1040 tp->tp_name, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1041 return NULL;
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1042 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1043
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1044 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1045 PyObject_HasAttr(PyObject v, PyObject name)
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1046 {
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1047 PyObject *res = PyObject_GetAttr(v, name);
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1048 if (res != NULL) {
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1049 Py_DECREF(res);
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1050 return 1;
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1051 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1052 PyErr_Clear();
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1053 return 0;
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1054 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1055
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1056 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1057 PyObject_SetAttr(PyObject v, PyObject name, PyObject *value)
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1058 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1059 PyTypeObject *tp = v->ob_type;
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1060 int err;
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1061
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1062 #ifdef Py_USING_UNICODE
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1063 /* The Unicode to string conversion is done here because the
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1064 existing tp_setattro slots expect a string object as name
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1065 and we wouldn't want to break those. */
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1066 if (PyUnicode_Check(name)) {
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1067 name = PyUnicode_AsEncodedString(name, NULL, NULL);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1068 if (name == NULL)
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1069 return -1;
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1070 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1071 else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1072 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1073 if (!PyString_Check(name)){
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1074 PyErr_SetString(PyExc_TypeError,
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1075 "attribute name must be string");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1076 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1077 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1078 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1079 Py_INCREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1080
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1081 PyString_InternInPlace(&name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1082 if (tp->tp_setattro != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1083 err = (*tp->tp_setattro)(v, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1084 Py_DECREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1085 return err;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1086 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1087 if (tp->tp_setattr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1088 err = (*tp->tp_setattr)(v, PyString_AS_STRING(name), value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1089 Py_DECREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1090 return err;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1091 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1092 Py_DECREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1093 if (tp->tp_getattr == NULL && tp->tp_getattro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1094 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1095 "'%.100s' object has no attributes "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1096 "(%s .%.100s)",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1097 tp->tp_name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1098 value==NULL ? "del" : "assign to",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1099 PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1100 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1101 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1102 "'%.100s' object has only read-only attributes "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1103 "(%s .%.100s)",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1104 tp->tp_name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1105 value==NULL ? "del" : "assign to",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1106 PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1107 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1108 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1109
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1110 /* Helper to get a pointer to an object's __dict__ slot, if any */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1111
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1112 PyObject **
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1113 _PyObject_GetDictPtr(PyObject *obj)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1114 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1115 #define PTRSIZE (sizeof(PyObject *))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1116
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1117 long dictoffset;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1118 PyTypeObject *tp = obj->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1119
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1120 if (!(tp->tp_flags & Py_TPFLAGS_HAVE_CLASS))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1121 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1122 dictoffset = tp->tp_dictoffset;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1123 if (dictoffset == 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1124 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1125 if (dictoffset < 0) {
19580 dc27839c0b80 Remove GC related code. It lives in gcmodule now. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19476 diff changeset	1126 dictoffset += tp->tp_basicsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1127 assert(dictoffset > 0); /* Sanity check */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1128 if (tp->tp_itemsize > 0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1129 int n = ((PyVarObject *)obj)->ob_size;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1130 if (n > 0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1131 dictoffset += tp->tp_itemsize * n;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1132 /* Round up, if necessary */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1133 if (tp->tp_itemsize % PTRSIZE != 0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1134 dictoffset += PTRSIZE - 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1135 dictoffset /= PTRSIZE;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1136 dictoffset *= PTRSIZE;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1137 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1138 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1139 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1140 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1141 return (PyObject *) ((char )obj + dictoffset);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1142 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1143
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1144 /* Generic GetAttr functions - put these in your tp_[gs]etattro slot */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1145
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1146 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1147 PyObject_GenericGetAttr(PyObject obj, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1148 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1149 PyTypeObject *tp = obj->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1150 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1151 descrgetfunc f;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1152 PyObject **dictptr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1153
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1154 if (tp->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1155 if (PyType_Ready(tp) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1156 return NULL;
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1157 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1158
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1159 descr = _PyType_Lookup(tp, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1160 f = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1161 if (descr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1162 f = descr->ob_type->tp_descr_get;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1163 if (f != NULL && PyDescr_IsData(descr))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1164 return f(descr, obj, (PyObject *)obj->ob_type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1165 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1166
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1167 dictptr = _PyObject_GetDictPtr(obj);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1168 if (dictptr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1169 PyObject dict = dictptr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1170 if (dict != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1171 PyObject *res = PyDict_GetItem(dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1172 if (res != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1173 Py_INCREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1174 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1175 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1176 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1177 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1178
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1179 if (f != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1180 return f(descr, obj, (PyObject *)obj->ob_type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1181
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1182 if (descr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1183 Py_INCREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1184 return descr;
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1185 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1186
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1187 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1188 "'%.50s' object has no attribute '%.400s'",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1189 tp->tp_name, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1190 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1191 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1192
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1193 int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1194 PyObject_GenericSetAttr(PyObject obj, PyObject name, PyObject *value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1195 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1196 PyTypeObject *tp = obj->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1197 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1198 descrsetfunc f;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1199 PyObject **dictptr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1200
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1201 if (tp->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1202 if (PyType_Ready(tp) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1203 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1204 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1205
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1206 descr = _PyType_Lookup(tp, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1207 f = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1208 if (descr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1209 f = descr->ob_type->tp_descr_set;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1210 if (f != NULL && PyDescr_IsData(descr))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1211 return f(descr, obj, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1212 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1213
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1214 dictptr = _PyObject_GetDictPtr(obj);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1215 if (dictptr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1216 PyObject dict = dictptr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1217 if (dict == NULL && value != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1218 dict = PyDict_New();
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1219 if (dict == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1220 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1221 *dictptr = dict;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1222 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1223 if (dict != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1224 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1225 if (value == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1226 res = PyDict_DelItem(dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1227 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1228 res = PyDict_SetItem(dict, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1229 if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1230 PyErr_SetObject(PyExc_AttributeError, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1231 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1232 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1233 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1234
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1235 if (f != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1236 return f(descr, obj, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1237
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1238 if (descr == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1239 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1240 "'%.50s' object has no attribute '%.400s'",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1241 tp->tp_name, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1242 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1243 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1244
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1245 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1246 "'%.50s' object attribute '%.400s' is read-only",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1247 tp->tp_name, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1248 return -1;
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1249 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1250
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1251 /* Test a value used as condition, e.g., in a for or if statement.
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1252 Return -1 if an error occurred */
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1253
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1254 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1255 PyObject_IsTrue(PyObject *v)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1256 {
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1257 int res;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1258 if (v == Py_None)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1259 res = 0;
8404 64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1260 else if (v->ob_type->tp_as_number != NULL &&
64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1261 v->ob_type->tp_as_number->nb_nonzero != NULL)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1262 res = (*v->ob_type->tp_as_number->nb_nonzero)(v);
8404 64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1263 else if (v->ob_type->tp_as_mapping != NULL &&
64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1264 v->ob_type->tp_as_mapping->mp_length != NULL)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1265 res = (*v->ob_type->tp_as_mapping->mp_length)(v);
8404 64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1266 else if (v->ob_type->tp_as_sequence != NULL &&
64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1267 v->ob_type->tp_as_sequence->sq_length != NULL)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1268 res = (*v->ob_type->tp_as_sequence->sq_length)(v);
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1269 else
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1270 res = 1;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1271 if (res > 0)
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1272 res = 1;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1273 return res;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1274 }
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1275
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1276 /* equivalent of 'not v'
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1277 Return -1 if an error occurred */
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1278
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1279 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1280 PyObject_Not(PyObject *v)
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1281 {
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1282 int res;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1283 res = PyObject_IsTrue(v);
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1284 if (res < 0)
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1285 return res;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1286 return res == 0;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1287 }
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1288
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1289 /* Coerce two numeric types to the "larger" one.
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1290 Increment the reference count on each argument.
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1291 Return value:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1292 -1 if an error occurred;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1293 0 if the coercion succeeded (and then the reference counts are increased);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1294 1 if no coercion is possible (and no error is raised).
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1295 */
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1296 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1297 PyNumber_CoerceEx(PyObject pv, PyObject pw)
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1298 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1299 register PyObject v = pv;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1300 register PyObject w = pw;
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1301 int res;
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1302
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1303 if (v->ob_type == w->ob_type && !PyInstance_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1304 Py_INCREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1305 Py_INCREF(w);
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1306 return 0;
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1307 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1308 if (v->ob_type->tp_as_number && v->ob_type->tp_as_number->nb_coerce) {
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1309 res = (*v->ob_type->tp_as_number->nb_coerce)(pv, pw);
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1310 if (res <= 0)
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1311 return res;
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1312 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1313 if (w->ob_type->tp_as_number && w->ob_type->tp_as_number->nb_coerce) {
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1314 res = (*w->ob_type->tp_as_number->nb_coerce)(pw, pv);
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1315 if (res <= 0)
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1316 return res;
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1317 }
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1318 return 1;
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1319 }
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1320
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1321 /* Coerce two numeric types to the "larger" one.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1322 Increment the reference count on each argument.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1323 Return -1 and raise an exception if no coercion is possible
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1324 (and then no reference count is incremented).
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1325 */
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1326 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1327 PyNumber_Coerce(PyObject pv, PyObject pw)
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1328 {
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1329 int err = PyNumber_CoerceEx(pv, pw);
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1330 if (err <= 0)
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1331 return err;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1332 PyErr_SetString(PyExc_TypeError, "number coercion failed");
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1333 return -1;
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1334 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1335
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1336
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1337 /* Test whether an object can be called */
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1338
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1339 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1340 PyCallable_Check(PyObject *x)
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1341 {
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1342 if (x == NULL)
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1343 return 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1344 if (PyInstance_Check(x)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1345 PyObject *call = PyObject_GetAttrString(x, "__call__");
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1346 if (call == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1347 PyErr_Clear();
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1348 return 0;
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1349 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1350 /* Could test recursively but don't, for fear of endless
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1351 recursion if some joker sets self.__call__ = self */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1352 Py_DECREF(call);
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1353 return 1;
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1354 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1355 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1356 return x->ob_type->tp_call != NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1357 }
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1358 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1359
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1360 /* Helper for PyObject_Dir.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1361 Merge the __dict__ of aclass into dict, and recursively also all
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1362 the __dict__s of aclass's base classes. The order of merging isn't
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1363 defined, as it's expected that only the final set of dict keys is
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1364 interesting.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1365 Return 0 on success, -1 on error.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1366 */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1367
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1368 static int
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1369 merge_class_dict(PyObject* dict, PyObject* aclass)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1370 {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1371 PyObject *classdict;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1372 PyObject *bases;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1373
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1374 assert(PyDict_Check(dict));
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1375 assert(aclass);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1376
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1377 /* Merge in the type's dict (if any). */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1378 classdict = PyObject_GetAttrString(aclass, "__dict__");
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1379 if (classdict == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1380 PyErr_Clear();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1381 else {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1382 int status = PyDict_Update(dict, classdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1383 Py_DECREF(classdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1384 if (status < 0)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1385 return -1;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1386 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1387
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1388 /* Recursively merge in the base types' (if any) dicts. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1389 bases = PyObject_GetAttrString(aclass, "__bases__");
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1390 if (bases != NULL) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1391 int i, n;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1392 assert(PyTuple_Check(bases));
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1393 n = PyTuple_GET_SIZE(bases);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1394 for (i = 0; i < n; i++) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1395 PyObject *base = PyTuple_GET_ITEM(bases, i);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1396 if (merge_class_dict(dict, base) < 0) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1397 Py_DECREF(bases);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1398 return -1;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1399 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1400 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1401 Py_DECREF(bases);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1402 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1403 return 0;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1404 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1405
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1406 /* Like __builtin__.dir(arg). See bltinmodule.c's builtin_dir for the
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1407 docstring, which should be kept in synch with this implementation. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1408
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1409 PyObject *
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1410 PyObject_Dir(PyObject *arg)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1411 {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1412 /* Set exactly one of these non-NULL before the end. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1413 PyObject result = NULL; / result list */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1414 PyObject masterdict = NULL; / result is masterdict.keys() */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1415
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1416 /* If NULL arg, return the locals. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1417 if (arg == NULL) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1418 PyObject *locals = PyEval_GetLocals();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1419 if (locals == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1420 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1421 result = PyDict_Keys(locals);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1422 if (result == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1423 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1424 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1425
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1426 /* Elif this is some form of module, we only want its dict. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1427 else if (PyObject_TypeCheck(arg, &PyModule_Type)) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1428 masterdict = PyObject_GetAttrString(arg, "__dict__");
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1429 if (masterdict == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1430 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1431 assert(PyDict_Check(masterdict));
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1432 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1433
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1434 /* Elif some form of type or class, grab its dict and its bases.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1435 We deliberately don't suck up its __class__, as methods belonging
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1436 to the metaclass would probably be more confusing than helpful. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1437 else if (PyType_Check(arg) \|\| PyClass_Check(arg)) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1438 masterdict = PyDict_New();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1439 if (masterdict == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1440 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1441 if (merge_class_dict(masterdict, arg) < 0)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1442 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1443 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1444
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1445 /* Else look at its dict, and the attrs reachable from its class. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1446 else {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1447 PyObject *itsclass;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1448 /* Create a dict to start with. CAUTION: Not everything
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1449 responding to __dict__ returns a dict! */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1450 masterdict = PyObject_GetAttrString(arg, "__dict__");
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1451 if (masterdict == NULL) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1452 PyErr_Clear();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1453 masterdict = PyDict_New();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1454 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1455 else if (!PyDict_Check(masterdict)) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1456 Py_DECREF(masterdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1457 masterdict = PyDict_New();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1458 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1459 else {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1460 /* The object may have returned a reference to its
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1461 dict, so copy it to avoid mutating it. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1462 PyObject *temp = PyDict_Copy(masterdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1463 Py_DECREF(masterdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1464 masterdict = temp;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1465 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1466 if (masterdict == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1467 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1468
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1469 /* Merge in attrs reachable from its class.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1470 CAUTION: Not all objects have a __class__ attr. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1471 itsclass = PyObject_GetAttrString(arg, "__class__");
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1472 if (itsclass == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1473 PyErr_Clear();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1474 else {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1475 int status = merge_class_dict(masterdict, itsclass);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1476 Py_DECREF(itsclass);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1477 if (status < 0)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1478 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1479 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1480 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1481
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1482 assert((result == NULL) ^ (masterdict == NULL));
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1483 if (masterdict != NULL) {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1484 /* The result comes from its keys. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1485 assert(result == NULL);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1486 result = PyDict_Keys(masterdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1487 if (result == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1488 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1489 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1490
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1491 assert(result);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1492 if (PyList_Sort(result) != 0)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1493 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1494 else
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1495 goto normal_return;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1496
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1497 error:
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1498 Py_XDECREF(result);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1499 result = NULL;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1500 /* fall through */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1501 normal_return:
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1502 Py_XDECREF(masterdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1503 return result;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1504 }
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1505
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1506 /*
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1507 NoObject is usable as a non-NULL undefined value, used by the macro None.
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1508 There is (and should be!) no way to create other objects of this type,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1509 so there is exactly one (which is indestructible, by the way).
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1510 (XXX This type and the type of NotImplemented below should be unified.)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1511 */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1512
739 ab1b3486b226 Fix lint bug Guido van Rossum <guido@python.org> parents: 512 diff changeset	1513 /* ARGSUSED */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1514 static PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1515 none_repr(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1516 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1517 return PyString_FromString("None");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1518 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1519
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1520 /* ARGUSED */
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1521 static void
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1522 none_dealloc(PyObject* ignore)
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1523 {
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1524 /* This should never get called, but we also don't want to SEGV if
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1525 * we accidently decref None out of existance.
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1526 */
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1527 abort();
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1528 }
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1529
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1530
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1531 static PyTypeObject PyNone_Type = {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1532 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1533 0,
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1534 "NoneType",
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1535 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1536 0,
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1537 (destructor)none_dealloc, /tp_dealloc/ /never called/
1051 f54e64c8b9b7 * Makefile: added IMGFILE; moved some stuff around. Guido van Rossum <guido@python.org> parents: 1017 diff changeset	1538 0, /tp_print/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1539 0, /tp_getattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1540 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1541 0, /tp_compare/
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1400 diff changeset	1542 (reprfunc)none_repr, /tp_repr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1543 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1544 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1545 0, /tp_as_mapping/
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1546 0, /tp_hash /
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1547 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1548
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1549 PyObject _Py_NoneStruct = {
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1550 PyObject_HEAD_INIT(&PyNone_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1551 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1552
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1553 /* NotImplemented is an object that can be used to signal that an
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1554 operation is not implemented for the given type combination. */
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1555
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1556 static PyObject *
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1557 NotImplemented_repr(PyObject *op)
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1558 {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1559 return PyString_FromString("NotImplemented");
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1560 }
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1561
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1562 static PyTypeObject PyNotImplemented_Type = {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1563 PyObject_HEAD_INIT(&PyType_Type)
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1564 0,
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1565 "NotImplementedType",
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1566 0,
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1567 0,
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1568 (destructor)none_dealloc, /tp_dealloc/ /never called/
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1569 0, /tp_print/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1570 0, /tp_getattr/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1571 0, /tp_setattr/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1572 0, /tp_compare/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1573 (reprfunc)NotImplemented_repr, /tp_repr/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1574 0, /tp_as_number/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1575 0, /tp_as_sequence/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1576 0, /tp_as_mapping/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1577 0, /tp_hash /
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1578 };
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1579
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1580 PyObject _Py_NotImplementedStruct = {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1581 PyObject_HEAD_INIT(&PyNotImplemented_Type)
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1582 };
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1583
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1584 void
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1585 _Py_ReadyTypes(void)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1586 {
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1587 if (PyType_Ready(&PyType_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1588 Py_FatalError("Can't initialize 'type'");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1589
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1590 if (PyType_Ready(&PyList_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1591 Py_FatalError("Can't initialize 'list'");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1592
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1593 if (PyType_Ready(&PyNone_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1594 Py_FatalError("Can't initialize type(None)");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1595
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1596 if (PyType_Ready(&PyNotImplemented_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1597 Py_FatalError("Can't initialize type(NotImplemented)");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1598 }
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1599
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1600
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1601 #ifdef Py_TRACE_REFS
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1602
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1603 static PyObject refchain = {&refchain, &refchain};
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1604
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1605 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1606 _Py_ResetReferences(void)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1607 {
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1608 refchain._ob_prev = refchain._ob_next = &refchain;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1609 _Py_RefTotal = 0;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1610 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1611
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1612 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1613 _Py_NewReference(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1614 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1615 _Py_RefTotal++;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1616 op->ob_refcnt = 1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1617 op->_ob_next = refchain._ob_next;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1618 op->_ob_prev = &refchain;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1619 refchain._ob_next->_ob_prev = op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1620 refchain._ob_next = op;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	1621 #ifdef COUNT_ALLOCS
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	1622 inc_count(op->ob_type);
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	1623 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1624 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1625
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1626 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1627 _Py_ForgetReference(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1628 {
11673 5e6e9e893acd The rest of the changes by Trent Mick and Dale Nagata for warning-free Guido van Rossum <guido@python.org> parents: 11649 diff changeset	1629 #ifdef SLOW_UNREF_CHECK
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1630 register PyObject *p;
11673 5e6e9e893acd The rest of the changes by Trent Mick and Dale Nagata for warning-free Guido van Rossum <guido@python.org> parents: 11649 diff changeset	1631 #endif
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	1632 if (op->ob_refcnt < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1633 Py_FatalError("UNREF negative refcnt");
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1634 if (op == &refchain \|\|
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	1635 op->_ob_prev->_ob_next != op \|\| op->_ob_next->_ob_prev != op)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1636 Py_FatalError("UNREF invalid object");
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1637 #ifdef SLOW_UNREF_CHECK
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1638 for (p = refchain._ob_next; p != &refchain; p = p->_ob_next) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1639 if (p == op)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1640 break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1641 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	1642 if (p == &refchain) /* Not found */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1643 Py_FatalError("UNREF unknown object");
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1644 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1645 op->_ob_next->_ob_prev = op->_ob_prev;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1646 op->_ob_prev->_ob_next = op->_ob_next;
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1647 op->_ob_next = op->_ob_prev = NULL;
2639 f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1648 #ifdef COUNT_ALLOCS
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1649 op->ob_type->tp_frees++;
2639 f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1650 #endif
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1651 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1652
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1653 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1654 _Py_Dealloc(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1655 {
1869 2cede61e9b1b rearranged code in debugging version of DELREF to avoid touching data Guido van Rossum <guido@python.org> parents: 1848 diff changeset	1656 destructor dealloc = op->ob_type->tp_dealloc;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1657 _Py_ForgetReference(op);
1869 2cede61e9b1b rearranged code in debugging version of DELREF to avoid touching data Guido van Rossum <guido@python.org> parents: 1848 diff changeset	1658 (*dealloc)(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1659 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1660
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1661 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1662 _Py_PrintReferences(FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1663 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1664 PyObject *op;
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1665 fprintf(fp, "Remaining objects:\n");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1666 for (op = refchain._ob_next; op != &refchain; op = op->_ob_next) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1667 fprintf(fp, "[%d] ", op->ob_refcnt);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1668 if (PyObject_Print(op, fp, 0) != 0)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1669 PyErr_Clear();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1670 putc('\n', fp);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1671 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1672 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1673
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1674 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1675 _Py_GetObjects(PyObject self, PyObject args)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1676 {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1677 int i, n;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1678 PyObject *t = NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1679 PyObject res, op;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1680
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1681 if (!PyArg_ParseTuple(args, "i\|O", &n, &t))
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1682 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1683 op = refchain._ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1684 res = PyList_New(0);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1685 if (res == NULL)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1686 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1687 for (i = 0; (n == 0 \|\| i < n) && op != &refchain; i++) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1688 while (op == self \|\| op == args \|\| op == res \|\| op == t \|\|
18600 859505224850 _Py_GetObjects(): GCC suggests to add () around && within \|\| for some Guido van Rossum <guido@python.org> parents: 18063 diff changeset	1689 (t != NULL && op->ob_type != (PyTypeObject *) t)) {
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1690 op = op->_ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1691 if (op == &refchain)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1692 return res;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1693 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1694 if (PyList_Append(res, op) < 0) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1695 Py_DECREF(res);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1696 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1697 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1698 op = op->_ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1699 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1700 return res;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1701 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1702
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1703 #endif
3330 9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1704
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1705
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1706 /* Hack to force loading of cobject.o */
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1707 PyTypeObject *_Py_cobject_hack = &PyCObject_Type;
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1708
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1709
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1710 /* Hack to force loading of abstract.o */
13575 7c119f050290 change abstract size functions PySequence_Size &c. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13551 diff changeset	1711 int (_Py_abstract_hack)(PyObject ) = &PyObject_Size;
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1712
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1713
14006 ed369f0aa32b Updated comment Andrew M. Kuchling <amk@amk.ca> parents: 13976 diff changeset	1714 /* Python's malloc wrappers (see pymem.h) */
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1715
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1716 void *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1717 PyMem_Malloc(size_t nbytes)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1718 {
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1719 #if _PyMem_EXTRA > 0
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1720 if (nbytes == 0)
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1721 nbytes = _PyMem_EXTRA;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1722 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1723 return PyMem_MALLOC(nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1724 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1725
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1726 void *
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1727 PyMem_Realloc(void *p, size_t nbytes)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1728 {
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1729 #if _PyMem_EXTRA > 0
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1730 if (nbytes == 0)
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1731 nbytes = _PyMem_EXTRA;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1732 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1733 return PyMem_REALLOC(p, nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1734 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1735
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1736 void
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1737 PyMem_Free(void *p)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1738 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1739 PyMem_FREE(p);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1740 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1741
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1742
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1743 /* Python's object malloc wrappers (see objimpl.h) */
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1744
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1745 void *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1746 PyObject_Malloc(size_t nbytes)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1747 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1748 return PyObject_MALLOC(nbytes);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1749 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1750
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1751 void *
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1752 PyObject_Realloc(void *p, size_t nbytes)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1753 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1754 return PyObject_REALLOC(p, nbytes);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1755 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1756
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1757 void
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1758 PyObject_Free(void *p)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1759 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1760 PyObject_FREE(p);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1761 }
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1762
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1763
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1764 /* Hook to clear up weak references only once the _weakref module is
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1765 imported. We use a dummy implementation to simplify the code at each
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1766 call site instead of requiring a test for NULL.
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1767 */
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1768
16768 d446e4ec9b7b The return value from PyObject_ClearWeakRefs() is no longer meaningful, Fred Drake <fdrake@acm.org> parents: 16742 diff changeset	1769 static void
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1770 empty_clear_weak_refs(PyObject *o)
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1771 {
16768 d446e4ec9b7b The return value from PyObject_ClearWeakRefs() is no longer meaningful, Fred Drake <fdrake@acm.org> parents: 16742 diff changeset	1772 return;
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1773 }
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1774
16768 d446e4ec9b7b The return value from PyObject_ClearWeakRefs() is no longer meaningful, Fred Drake <fdrake@acm.org> parents: 16742 diff changeset	1775 void (PyObject_ClearWeakRefs)(PyObject ) = empty_clear_weak_refs;
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1776
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1777
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16236 diff changeset	1778
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1779 /* These methods are used to control infinite recursion in repr, str, print,
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1780 etc. Container objects that may recursively contain themselves,
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1781 e.g. builtin dictionaries and lists, should used Py_ReprEnter() and
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1782 Py_ReprLeave() to avoid infinite recursion.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1783
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1784 Py_ReprEnter() returns 0 the first time it is called for a particular
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1785 object and 1 every time thereafter. It returns -1 if an exception
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1786 occurred. Py_ReprLeave() has no return value.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1787
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1788 See dictobject.c and listobject.c for examples of use.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1789 */
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1790
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1791 #define KEY "Py_Repr"
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1792
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1793 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1794 Py_ReprEnter(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1795 {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1796 PyObject *dict;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1797 PyObject *list;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1798 int i;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1799
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1800 dict = PyThreadState_GetDict();
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1801 if (dict == NULL)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1802 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1803 list = PyDict_GetItemString(dict, KEY);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1804 if (list == NULL) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1805 list = PyList_New(0);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1806 if (list == NULL)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1807 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1808 if (PyDict_SetItemString(dict, KEY, list) < 0)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1809 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1810 Py_DECREF(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1811 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1812 i = PyList_GET_SIZE(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1813 while (--i >= 0) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1814 if (PyList_GET_ITEM(list, i) == obj)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1815 return 1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1816 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1817 PyList_Append(list, obj);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1818 return 0;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1819 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1820
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1821 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1822 Py_ReprLeave(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1823 {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1824 PyObject *dict;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1825 PyObject *list;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1826 int i;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1827
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1828 dict = PyThreadState_GetDict();
8006 a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1829 if (dict == NULL)
a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1830 return;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1831 list = PyDict_GetItemString(dict, KEY);
8006 a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1832 if (list == NULL \|\| !PyList_Check(list))
a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1833 return;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1834 i = PyList_GET_SIZE(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1835 /* Count backwards because we always expect obj to be list[-1] */
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1836 while (--i >= 0) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1837 if (PyList_GET_ITEM(list, i) == obj) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1838 PyList_SetSlice(list, i, i + 1, NULL);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1839 break;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1840 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1841 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1842 }
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1843
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1844 /*
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1845 trashcan
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1846 CT 2k0130
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1847 non-recursively destroy nested objects
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1848
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1849 CT 2k0223
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1850 everything is now done in a macro.
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1851
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1852 CT 2k0305
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1853 modified to use functions, after Tim Peter's suggestion.
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1854
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1855 CT 2k0309
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1856 modified to restore a possible error.
12052 5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1857
5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1858 CT 2k0325
5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1859 added better safe than sorry check for threadstate
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1860
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1861 CT 2k0422
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1862 complete rewrite. We now build a chain via ob_type
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1863 and save the limited number of types in ob_refcnt.
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1864 This is perfect since we don't need any memory.
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1865 A patch for free-threading would need just a lock.
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1866 */
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1867
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1868 #define Py_TRASHCAN_TUPLE 1
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1869 #define Py_TRASHCAN_LIST 2
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1870 #define Py_TRASHCAN_DICT 3
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1871 #define Py_TRASHCAN_FRAME 4
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1872 #define Py_TRASHCAN_TRACEBACK 5
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1873 /* extend here if other objects want protection */
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1874
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1875 int _PyTrash_delete_nesting = 0;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1876
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1877 PyObject * _PyTrash_delete_later = NULL;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1878
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1879 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1880 _PyTrash_deposit_object(PyObject *op)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1881 {
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1882 int typecode;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1883
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1884 if (PyTuple_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1885 typecode = Py_TRASHCAN_TUPLE;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1886 else if (PyList_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1887 typecode = Py_TRASHCAN_LIST;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1888 else if (PyDict_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1889 typecode = Py_TRASHCAN_DICT;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1890 else if (PyFrame_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1891 typecode = Py_TRASHCAN_FRAME;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1892 else if (PyTraceBack_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1893 typecode = Py_TRASHCAN_TRACEBACK;
13861 f3d5f71ccbb4 Removing warnings found by gcc -Wall Moshe Zadka <moshez@math.huji.ac.il> parents: 13761 diff changeset	1894 else /* We have a bug here -- those are the only types in GC */ {
f3d5f71ccbb4 Removing warnings found by gcc -Wall Moshe Zadka <moshez@math.huji.ac.il> parents: 13761 diff changeset	1895 Py_FatalError("Type not supported in GC -- internal bug");
f3d5f71ccbb4 Removing warnings found by gcc -Wall Moshe Zadka <moshez@math.huji.ac.il> parents: 13761 diff changeset	1896 return; /* pacify compiler -- execution never here */
f3d5f71ccbb4 Removing warnings found by gcc -Wall Moshe Zadka <moshez@math.huji.ac.il> parents: 13761 diff changeset	1897 }
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1898 op->ob_refcnt = typecode;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1899
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1900 op->ob_type = (PyTypeObject*)_PyTrash_delete_later;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1901 _PyTrash_delete_later = op;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1902 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1903
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1904 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1905 _PyTrash_destroy_chain(void)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1906 {
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1907 while (_PyTrash_delete_later) {
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1908 PyObject *shredder = _PyTrash_delete_later;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1909 _PyTrash_delete_later = (PyObject*) shredder->ob_type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1910
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1911 switch (shredder->ob_refcnt) {
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1912 case Py_TRASHCAN_TUPLE:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1913 shredder->ob_type = &PyTuple_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1914 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1915 case Py_TRASHCAN_LIST:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1916 shredder->ob_type = &PyList_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1917 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1918 case Py_TRASHCAN_DICT:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1919 shredder->ob_type = &PyDict_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1920 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1921 case Py_TRASHCAN_FRAME:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1922 shredder->ob_type = &PyFrame_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1923 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1924 case Py_TRASHCAN_TRACEBACK:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1925 shredder->ob_type = &PyTraceBack_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1926 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1927 }
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1928 _Py_NewReference(shredder);
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1929
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1930 ++_PyTrash_delete_nesting;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1931 Py_DECREF(shredder);
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1932 --_PyTrash_delete_nesting;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1933 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1934 }
16782 5864a9c58c81 Add Vladimir Marangozov's object allocator. It is disabled by default. This Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 16768 diff changeset	1935
5864a9c58c81 Add Vladimir Marangozov's object allocator. It is disabled by default. This Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 16768 diff changeset	1936 #ifdef WITH_PYMALLOC
5864a9c58c81 Add Vladimir Marangozov's object allocator. It is disabled by default. This Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 16768 diff changeset	1937 #include "obmalloc.c"
5864a9c58c81 Add Vladimir Marangozov's object allocator. It is disabled by default. This Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 16768 diff changeset	1938 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/object.c @ 19814:dc87d91d0dfd legacy-trunk