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

annotate Objects/object.c @ 15164:8930ec3bc00a legacy-trunk

Added additional test cases for pulldom modifications.

author	Lars Gustäbel <lars@gustaebel.de>
date	Wed, 11 Oct 2000 22:36:00 +0000
parents	25ddd3dc7a7a
children	8aa947e1eee8

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
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	19 /* Object allocation routines used by NEWOBJ and NEWVAROBJ macros.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	20 These are used by the individual routines for object creation.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	21 Do not call them otherwise, they do not initialize the object! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	22
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	23 #ifdef COUNT_ALLOCS
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	24 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	25 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	26 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	27 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	28 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	29 dump_counts(void)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	30 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	31 PyTypeObject *tp;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	32
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	33 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	34 fprintf(stderr, "%s alloc'd: %d, freed: %d, max in use: %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	35 tp->tp_name, tp->tp_alloc, tp->tp_free,
7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	36 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	37 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	38 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	39 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	40 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	41 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	42 null_strings, one_strings);
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	43 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	44
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	45 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	46 get_counts(void)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	47 {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	48 PyTypeObject *tp;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	49 PyObject *result;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	50 PyObject *v;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	51
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	52 result = PyList_New(0);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	53 if (result == NULL)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	54 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	55 for (tp = type_list; tp; tp = tp->tp_next) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	56 v = Py_BuildValue("(siii)", tp->tp_name, tp->tp_alloc,
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	57 tp->tp_free, tp->tp_maxalloc);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	58 if (v == NULL) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	59 Py_DECREF(result);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	60 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	61 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	62 if (PyList_Append(result, v) < 0) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	63 Py_DECREF(v);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	64 Py_DECREF(result);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	65 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	66 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	67 Py_DECREF(v);
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 return result;
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
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	72 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	73 inc_count(PyTypeObject *tp)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	74 {
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	75 if (tp->tp_alloc == 0) {
2639 f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	76 /* 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	77 if (tp->tp_next != NULL) /* sanity check */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	78 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	79 tp->tp_next = type_list;
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	80 type_list = tp;
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	81 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	82 tp->tp_alloc++;
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	83 if (tp->tp_alloc - tp->tp_free > tp->tp_maxalloc)
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	84 tp->tp_maxalloc = tp->tp_alloc - tp->tp_free;
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	85 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	86 #endif
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	87
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	88 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	89 PyObject_Init(PyObject op, PyTypeObject tp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	90 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	91 if (op == NULL) {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	92 PyErr_SetString(PyExc_SystemError,
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	93 "NULL object passed to PyObject_Init");
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	94 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	95 }
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	96 #ifdef WITH_CYCLE_GC
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	97 if (PyType_IS_GC(tp))
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	98 op = (PyObject *) PyObject_FROM_GC(op);
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	99 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	100 /* 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	101 op->ob_type = tp;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	102 _Py_NewReference(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103 return op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	104 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	105
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	106 PyVarObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	107 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	108 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	109 if (op == NULL) {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	110 PyErr_SetString(PyExc_SystemError,
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	111 "NULL object passed to PyObject_InitVar");
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	112 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	113 }
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	114 #ifdef WITH_CYCLE_GC
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	115 if (PyType_IS_GC(tp))
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	116 op = (PyVarObject *) PyObject_FROM_GC(op);
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	117 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	118 /* 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	119 op->ob_size = size;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	120 op->ob_type = tp;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	121 _Py_NewReference((PyObject *)op);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	122 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	123 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	124
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	125 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	126 _PyObject_New(PyTypeObject *tp)
12576 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 PyObject *op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	129 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	130 if (op == NULL)
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	131 return PyErr_NoMemory();
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	132 #ifdef WITH_CYCLE_GC
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	133 if (PyType_IS_GC(tp))
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	134 op = (PyObject *) PyObject_FROM_GC(op);
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	135 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	136 return PyObject_INIT(op, tp);
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
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	139 PyVarObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	140 _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	141 {
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	142 PyVarObject *op;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	143 op = (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE(tp, size));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	144 if (op == NULL)
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	145 return (PyVarObject *)PyErr_NoMemory();
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	146 #ifdef WITH_CYCLE_GC
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	147 if (PyType_IS_GC(tp))
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	148 op = (PyVarObject *) PyObject_FROM_GC(op);
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	149 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	150 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	151 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	152
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	153 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	154 _PyObject_Del(PyObject *op)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	155 {
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	156 #ifdef WITH_CYCLE_GC
13265 e8bb0d536633 Neil Schemenauer: small fixes for GC Guido van Rossum <guido@python.org> parents: 13256 diff changeset	157 if (op && PyType_IS_GC(op->ob_type)) {
e8bb0d536633 Neil Schemenauer: small fixes for GC Guido van Rossum <guido@python.org> parents: 13256 diff changeset	158 op = (PyObject *) PyObject_AS_GC(op);
e8bb0d536633 Neil Schemenauer: small fixes for GC Guido van Rossum <guido@python.org> parents: 13256 diff changeset	159 }
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	160 #endif
13265 e8bb0d536633 Neil Schemenauer: small fixes for GC Guido van Rossum <guido@python.org> parents: 13256 diff changeset	161 PyObject_FREE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	162 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	163
13183 54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	164 #ifndef WITH_CYCLE_GC
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	165 /* extension modules might need these */
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	166 void _PyGC_Insert(PyObject *op) { }
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	167 void _PyGC_Remove(PyObject *op) { }
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	168 #endif
54bffdddc0ef final patches from Neil Schemenauer for garbage collection Jeremy Hylton <jeremy@alum.mit.edu> parents: 13141 diff changeset	169
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	170 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	171 PyObject_Print(PyObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	172 {
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	173 int ret = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	174 if (PyErr_CheckSignals())
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	175 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	176 #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	177 if (PyOS_CheckStack()) {
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	178 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	179 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	180 }
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	181 #endif
11649 38560a3a3249 On Linux, one sometimes sees spurious errors after interrupting Guido van Rossum <guido@python.org> parents: 8695 diff changeset	182 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	183 if (op == NULL) {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	184 fprintf(fp, "<nil>");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	185 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	186 else {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	187 if (op->ob_refcnt <= 0)
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	188 fprintf(fp, "<refcnt %u at %p>",
ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	189 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	190 else if (op->ob_type->tp_print == NULL) {
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	191 if (op->ob_type->tp_repr == NULL) {
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	192 fprintf(fp, "<%s object at %p>",
ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	193 op->ob_type->tp_name, 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	194 }
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	195 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	196 PyObject *s;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	197 if (flags & Py_PRINT_RAW)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	198 s = PyObject_Str(op);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	199 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	200 s = PyObject_Repr(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	201 if (s == NULL)
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	202 ret = -1;
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	203 else {
8111 5c9be98f5347 Be less naive about null characters in an object's repr(). Guido van Rossum <guido@python.org> parents: 8006 diff changeset	204 ret = PyObject_Print(s, fp,
5c9be98f5347 Be less naive about null characters in an object's repr(). Guido van Rossum <guido@python.org> parents: 8006 diff changeset	205 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	206 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	207 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	208 }
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	209 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	210 else
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	211 ret = (*op->ob_type->tp_print)(op, fp, flags);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	212 }
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	213 if (ret == 0) {
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	214 if (ferror(fp)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	215 PyErr_SetFromErrno(PyExc_IOError);
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	216 clearerr(fp);
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	217 ret = -1;
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	218 }
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	219 }
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	220 return ret;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	221 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	222
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	223 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	224 PyObject_Repr(PyObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	225 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	226 if (PyErr_CheckSignals())
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	227 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	228 #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	229 if (PyOS_CheckStack()) {
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	230 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	231 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	232 }
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	233 #endif
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	234 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	235 return PyString_FromString("<NULL>");
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	236 else if (v->ob_type->tp_repr == NULL) {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	237 char buf[120];
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	238 sprintf(buf, "<%.80s object at %p>",
ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13183 diff changeset	239 v->ob_type->tp_name, v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	240 return PyString_FromString(buf);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	241 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	242 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	243 PyObject *res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	244 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	245 if (res == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	246 return NULL;
13293 e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	247 if (PyUnicode_Check(res)) {
e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	248 PyObject* str;
13436 bc9e22ad5c46 - changed __repr__ to use "unicode escape" encoding for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 13432 diff changeset	249 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	250 Py_DECREF(res);
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	251 if (str)
13293 e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	252 res = str;
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	253 else
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	254 return NULL;
13293 e38be8717ec0 changed repr and str to always convert unicode strings Fredrik Lundh <fredrik@pythonware.com> parents: 13265 diff changeset	255 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	256 if (!PyString_Check(res)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	257 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	258 "__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	259 res->ob_type->tp_name);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	260 Py_DECREF(res);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	261 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	262 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	263 return res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	264 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	265 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	266
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	267 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	268 PyObject_Str(PyObject *v)
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	269 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	270 PyObject *res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	271
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	272 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	273 return PyString_FromString("<NULL>");
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	274 else if (PyString_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	275 Py_INCREF(v);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	276 return v;
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	277 }
2160 899b4e3dfd4c fix strobject() behavior Guido van Rossum <guido@python.org> parents: 2124 diff changeset	278 else if (v->ob_type->tp_str != NULL)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	279 res = (*v->ob_type->tp_str)(v);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	280 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	281 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	282 if (!PyInstance_Check(v) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	283 (func = PyObject_GetAttrString(v, "__str__")) == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	284 PyErr_Clear();
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	285 return PyObject_Repr(v);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	286 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	287 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	288 Py_DECREF(func);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	289 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	290 if (res == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	291 return NULL;
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	292 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	293 PyObject* str;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	294 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	295 Py_DECREF(res);
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	296 if (str)
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	297 res = str;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	298 else
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	299 return NULL;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	300 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	301 if (!PyString_Check(res)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	302 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	303 "__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	304 res->ob_type->tp_name);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	305 Py_DECREF(res);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	306 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	307 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	308 return res;
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	309 }
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	310
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	311 static PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	312 do_cmp(PyObject v, PyObject w)
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	313 {
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	314 long c;
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	315 /* __rcmp__ actually won't be called unless __cmp__ isn't defined,
36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	316 because the check in cmpobject() reverses the objects first.
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	317 This is intentional -- it makes no sense to define cmp(x,y)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	318 different than -cmp(y,x). */
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	319 if (PyInstance_Check(v) \|\| PyInstance_Check(w))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	320 return PyInstance_DoBinOp(v, w, "__cmp__", "__rcmp__", do_cmp);
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	321 c = PyObject_Compare(v, w);
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	322 if (c && PyErr_Occurred())
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	323 return NULL;
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	324 return PyInt_FromLong(c);
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	325 }
36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	326
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	327 PyObject *_PyCompareState_Key;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	328
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13580 diff changeset	329 /* _PyCompareState_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	330 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	331 nesting limit, enable code to detect circular data structures.
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	332 */
14126 41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	333 #ifdef macintosh
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	334 #define NESTING_LIMIT 60
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	335 #else
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	336 #define NESTING_LIMIT 500
14126 41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	337 #endif
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	338 int _PyCompareState_nesting = 0;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	339
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	340 static PyObject*
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	341 get_inprogress_dict(void)
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	342 {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	343 PyObject tstate_dict, inprogress;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	344
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	345 tstate_dict = PyThreadState_GetDict();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	346 if (tstate_dict == NULL) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	347 PyErr_BadInternalCall();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	348 return NULL;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	349 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	350 inprogress = PyDict_GetItem(tstate_dict, _PyCompareState_Key);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	351 if (inprogress == NULL) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	352 inprogress = PyDict_New();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	353 if (inprogress == NULL)
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	354 return NULL;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	355 if (PyDict_SetItem(tstate_dict, _PyCompareState_Key,
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	356 inprogress) == -1) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	357 Py_DECREF(inprogress);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	358 return NULL;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	359 }
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	360 Py_DECREF(inprogress);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	361 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	362 return inprogress;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	363 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	364
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	365 static PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	366 make_pair(PyObject v, PyObject w)
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	367 {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	368 PyObject *pair;
14051 fee0f402eccb make_pair(): When comparing the pointers, they must be cast to integer Barry Warsaw <barry@python.org> parents: 14006 diff changeset	369 Py_uintptr_t iv = (Py_uintptr_t)v;
fee0f402eccb make_pair(): When comparing the pointers, they must be cast to integer Barry Warsaw <barry@python.org> parents: 14006 diff changeset	370 Py_uintptr_t iw = (Py_uintptr_t)w;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	371
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	372 pair = PyTuple_New(2);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	373 if (pair == NULL) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	374 return NULL;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	375 }
14051 fee0f402eccb make_pair(): When comparing the pointers, they must be cast to integer Barry Warsaw <barry@python.org> parents: 14006 diff changeset	376 if (iv <= iw) {
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	377 PyTuple_SET_ITEM(pair, 0, PyLong_FromVoidPtr((void *)v));
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	378 PyTuple_SET_ITEM(pair, 1, PyLong_FromVoidPtr((void *)w));
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	379 } else {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	380 PyTuple_SET_ITEM(pair, 0, PyLong_FromVoidPtr((void *)w));
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	381 PyTuple_SET_ITEM(pair, 1, PyLong_FromVoidPtr((void *)v));
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	382 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	383 return pair;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	384 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	385
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	386 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	387 PyObject_Compare(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	388 {
8472 c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	389 PyTypeObject vtp, wtp;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	390 int result;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	391
14126 41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	392 #if defined(USE_STACKCHECK)
14265 1f76fc98b4c8 PyOS_CheckStack() returns 1 when failing, not -1. Guido van Rossum <guido@python.org> parents: 14126 diff changeset	393 if (PyOS_CheckStack()) {
14126 41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	394 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	395 return -1;
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	396 }
41eb755e4ed1 Added PyOS_CheckStack call to PyObject_Compare Jack Jansen <jack.jansen@cwi.nl> parents: 14051 diff changeset	397 #endif
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	398 if (v == NULL \|\| w == NULL) {
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	399 PyErr_BadInternalCall();
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	400 return -1;
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	401 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	402 if (v == w)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	403 return 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	404 if (PyInstance_Check(v) \|\| PyInstance_Check(w)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	405 PyObject *res;
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	406 int c;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	407 if (!PyInstance_Check(v))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	408 return -PyObject_Compare(w, v);
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	409 _PyCompareState_nesting++;
4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	410 if (_PyCompareState_nesting > NESTING_LIMIT) {
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	411 PyObject inprogress, pair;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	412
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	413 inprogress = get_inprogress_dict();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	414 if (inprogress == NULL) {
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	415 _PyCompareState_nesting--;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	416 return -1;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	417 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	418 pair = make_pair(v, w);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	419 if (PyDict_GetItem(inprogress, pair)) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	420 /* already comparing these objects. assume
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	421 they're equal until shown otherwise */
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	422 Py_DECREF(pair);
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	423 _PyCompareState_nesting--;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	424 return 0;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	425 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	426 if (PyDict_SetItem(inprogress, pair, pair) == -1) {
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	427 _PyCompareState_nesting--;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	428 return -1;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	429 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	430 res = do_cmp(v, w);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	431 /* XXX DelItem shouldn't fail */
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	432 PyDict_DelItem(inprogress, pair);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	433 Py_DECREF(pair);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	434 } else {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	435 res = do_cmp(v, w);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	436 }
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	437 _PyCompareState_nesting--;
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	438 if (res == NULL)
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	439 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	440 if (!PyInt_Check(res)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	441 Py_DECREF(res);
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	442 PyErr_SetString(PyExc_TypeError,
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	443 "comparison did not return an int");
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	444 return -1;
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	445 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	446 c = PyInt_AsLong(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	447 Py_DECREF(res);
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	448 return (c < 0) ? -1 : (c > 0) ? 1 : 0;
36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	449 }
8472 c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	450 if ((vtp = v->ob_type) != (wtp = w->ob_type)) {
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	451 char *vname = vtp->tp_name;
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	452 char *wname = wtp->tp_name;
8695 6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	453 if (vtp->tp_as_number != NULL && wtp->tp_as_number != NULL) {
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	454 int err;
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	455 err = PyNumber_CoerceEx(&v, &w);
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	456 if (err < 0)
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5560 diff changeset	457 return -1;
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	458 else if (err == 0) {
8695 6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	459 int cmp;
6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	460 vtp = v->ob_type;
6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	461 if (vtp->tp_compare == NULL)
6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	462 cmp = (v < w) ? -1 : 1;
6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	463 else
6d2168a9641f When comparing objects, always check that tp_compare is not NULL Guido van Rossum <guido@python.org> parents: 8472 diff changeset	464 cmp = (*vtp->tp_compare)(v, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	465 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	466 Py_DECREF(w);
307 35a2528f8a73 Change cmpobject() to coerce numerical values before comparing them Guido van Rossum <guido@python.org> parents: 284 diff changeset	467 return cmp;
35a2528f8a73 Change cmpobject() to coerce numerical values before comparing them Guido van Rossum <guido@python.org> parents: 284 diff changeset	468 }
35a2528f8a73 Change cmpobject() to coerce numerical values before comparing them Guido van Rossum <guido@python.org> parents: 284 diff changeset	469 }
12327 66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	470 else if (PyUnicode_Check(v) \|\| PyUnicode_Check(w)) {
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	471 int result = PyUnicode_Compare(v, w);
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	472 if (result == -1 && PyErr_Occurred() &&
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	473 PyErr_ExceptionMatches(PyExc_TypeError))
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	474 /* TypeErrors are ignored: if Unicode coercion
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	475 fails due to one of the arguments not
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	476 having the right type, we continue as
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	477 defined by the coercion protocol (see
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	478 above). Luckily, decoding errors are
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	479 reported as ValueErrors and are not masked
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	480 by this technique. */
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	481 PyErr_Clear();
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	482 else
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	483 return result;
66b4906d0fc6 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	484 }
8472 c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	485 else if (vtp->tp_as_number != NULL)
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	486 vname = "";
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	487 else if (wtp->tp_as_number != NULL)
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	488 wname = "";
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	489 /* Numerical types compare smaller than all other types */
c555c72f090d When comparing objects of different types (which is done by comparing Guido van Rossum <guido@python.org> parents: 8404 diff changeset	490 return strcmp(vname, wname);
307 35a2528f8a73 Change cmpobject() to coerce numerical values before comparing them Guido van Rossum <guido@python.org> parents: 284 diff changeset	491 }
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	492 if (vtp->tp_compare == NULL) {
14051 fee0f402eccb make_pair(): When comparing the pointers, they must be cast to integer Barry Warsaw <barry@python.org> parents: 14006 diff changeset	493 Py_uintptr_t iv = (Py_uintptr_t)v;
fee0f402eccb make_pair(): When comparing the pointers, they must be cast to integer Barry Warsaw <barry@python.org> parents: 14006 diff changeset	494 Py_uintptr_t iw = (Py_uintptr_t)w;
fee0f402eccb make_pair(): When comparing the pointers, they must be cast to integer Barry Warsaw <barry@python.org> parents: 14006 diff changeset	495 return (iv < iw) ? -1 : 1;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	496 }
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	497 _PyCompareState_nesting++;
4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	498 if (_PyCompareState_nesting > NESTING_LIMIT
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	499 && (vtp->tp_as_mapping
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	500 \|\| (vtp->tp_as_sequence && !PyString_Check(v)))) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	501 PyObject inprogress, pair;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	502
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	503 inprogress = get_inprogress_dict();
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	504 if (inprogress == NULL) {
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	505 _PyCompareState_nesting--;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	506 return -1;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	507 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	508 pair = make_pair(v, w);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	509 if (PyDict_GetItem(inprogress, pair)) {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	510 /* already comparing these objects. assume
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	511 they're equal until shown otherwise */
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	512 Py_DECREF(pair);
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	513 _PyCompareState_nesting--;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	514 return 0;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	515 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	516 if (PyDict_SetItem(inprogress, pair, pair) == -1) {
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	517 _PyCompareState_nesting--;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	518 return -1;
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	519 }
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	520 result = (*vtp->tp_compare)(v, w);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	521 PyDict_DelItem(inprogress, pair); /* XXX shouldn't fail */
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	522 Py_DECREF(pair);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	523 } else {
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	524 result = (*vtp->tp_compare)(v, w);
ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	525 }
13915 4d16c8dd899c Fix missing decrements of the recursive counter in PyObject_Compare(). Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13861 diff changeset	526 _PyCompareState_nesting--;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	527 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	528 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	529
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	530
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	531 /* 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	532 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	533
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	534 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	535 */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	536
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	537 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	538 _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	539 {
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	540 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	541 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	542 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	543 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	544 /* 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	545 * 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	546 * 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	547 */
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	548
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	549 #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	550 {
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	551 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	552 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	553 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	554 }
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	555 #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	556 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	557 #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	558 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	559 /* 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	560 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	561 /* 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	562 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	563 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	564 /* 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	565 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	566 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	567 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	568 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	569 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	570 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	571 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	572 }
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	573 /* 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	574 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	575 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	576 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	577 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	578 }
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	579 /* 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	580 * 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	581 * 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	582 * 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	583 * 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	584 * 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	585 * 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	586 * 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	587 * 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	588 * 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	589 * 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	590 */
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	591 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	592 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	593 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	594 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	595 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	596 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	597 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	598 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	599 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	600
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	601 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	602 _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	603 {
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	604 #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	605 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	606 #else
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	607 /* 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	608 PyObject* longobj;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	609 long x;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	610
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	611 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	612 x = -1;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	613 goto finally;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	614 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	615 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	616
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	617 finally:
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	618 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	619 return x;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	620 #endif
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	621 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	622
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	623
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	624 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	625 PyObject_Hash(PyObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	626 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	627 PyTypeObject *tp = v->ob_type;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	628 if (tp->tp_hash != NULL)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	629 return (*tp->tp_hash)(v);
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	630 if (tp->tp_compare == NULL) {
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	631 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	632 }
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	633 /* 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	634 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	635 return -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	636 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	637
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	638 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	639 PyObject_GetAttrString(PyObject v, char name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	640 {
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	641 if (v->ob_type->tp_getattro != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	642 PyObject w, res;
5006 5f4b23e3d97c Intern the strings created in getattr() and setattr(). Guido van Rossum <guido@python.org> parents: 4588 diff changeset	643 w = PyString_InternFromString(name);
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	644 if (w == NULL)
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	645 return NULL;
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	646 res = (*v->ob_type->tp_getattro)(v, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	647 Py_XDECREF(w);
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	648 return res;
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	649 }
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	650
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	651 if (v->ob_type->tp_getattr == NULL) {
7119 516189984b0c Instead of "attribute-less object", issue an error message that Guido van Rossum <guido@python.org> parents: 6597 diff changeset	652 PyErr_Format(PyExc_AttributeError,
516189984b0c Instead of "attribute-less object", issue an error message that Guido van Rossum <guido@python.org> parents: 6597 diff changeset	653 "'%.50s' object has no attribute '%.400s'",
516189984b0c Instead of "attribute-less object", issue an error message that Guido van Rossum <guido@python.org> parents: 6597 diff changeset	654 v->ob_type->tp_name,
516189984b0c Instead of "attribute-less object", issue an error message that Guido van Rossum <guido@python.org> parents: 6597 diff changeset	655 name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	656 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	657 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	658 else {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	659 return (*v->ob_type->tp_getattr)(v, name);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	660 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	661 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	662
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	663 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	664 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	665 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	666 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	667 if (res != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	668 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	669 return 1;
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	670 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	671 PyErr_Clear();
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	672 return 0;
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	673 }
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	674
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	675 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	676 PyObject_SetAttrString(PyObject v, char name, PyObject *w)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	677 {
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	678 if (v->ob_type->tp_setattro != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	679 PyObject *s;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	680 int res;
5006 5f4b23e3d97c Intern the strings created in getattr() and setattr(). Guido van Rossum <guido@python.org> parents: 4588 diff changeset	681 s = PyString_InternFromString(name);
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	682 if (s == NULL)
4288 43ae045aa10e Correct typo in setattr: return -1 for error, not NULL Guido van Rossum <guido@python.org> parents: 4002 diff changeset	683 return -1;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	684 res = (*v->ob_type->tp_setattro)(v, s, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	685 Py_XDECREF(s);
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	686 return res;
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	687 }
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	688
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	689 if (v->ob_type->tp_setattr == NULL) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	690 if (v->ob_type->tp_getattr == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	691 PyErr_SetString(PyExc_TypeError,
512 8414e1f9a5fe Change error messages for impossible assignment slightly. Guido van Rossum <guido@python.org> parents: 473 diff changeset	692 "attribute-less object (assign or del)");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	693 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	694 PyErr_SetString(PyExc_TypeError,
512 8414e1f9a5fe Change error messages for impossible assignment slightly. Guido van Rossum <guido@python.org> parents: 473 diff changeset	695 "object has read-only attributes");
95 a5bf7d5959ce Return -1 for errors. Guido van Rossum <guido@python.org> parents: 86 diff changeset	696 return -1;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	697 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	698 else {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	699 return (*v->ob_type->tp_setattr)(v, name, w);
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	700 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	701 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	702
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	703 /* Internal API needed by PyObject_GetAttr(): */
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	704 extern
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	705 PyObject _PyUnicode_AsDefaultEncodedString(PyObject unicode,
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	706 const char *errors);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	707
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	708 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	709 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	710 {
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	711 /* 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	712 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	713 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	714 if (PyUnicode_Check(name)) {
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	715 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	716 if (name == NULL)
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	717 return NULL;
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	718 }
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	719
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	720 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	721 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	722 "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	723 return NULL;
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	724 }
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	725 if (v->ob_type->tp_getattro != NULL)
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	726 return (*v->ob_type->tp_getattro)(v, name);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	727 else
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	728 return PyObject_GetAttrString(v, PyString_AS_STRING(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	729 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	730
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	731 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	732 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	733 {
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	734 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	735 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	736 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	737 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	738 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	739 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	740 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	741 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	742
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	743 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	744 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	745 {
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	746 int err;
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	747
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	748 /* 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	749 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	750 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	751 if (PyUnicode_Check(name)) {
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	752 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	753 if (name == NULL)
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	754 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	755 }
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	756 else
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	757 Py_INCREF(name);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	758
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	759 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	760 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	761 "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	762 err = -1;
1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	763 }
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	764 else {
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	765 PyString_InternInPlace(&name);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	766 if (v->ob_type->tp_setattro != NULL)
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	767 err = (*v->ob_type->tp_setattro)(v, name, value);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	768 else
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	769 err = PyObject_SetAttrString(v,
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	770 PyString_AS_STRING(name), value);
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	771 }
983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	772
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	773 Py_DECREF(name);
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	774 return err;
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	775 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	776
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	777 /* 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	778 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	779
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	780 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	781 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	782 {
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	783 int res;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	784 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	785 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	786 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	787 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	788 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	789 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	790 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	791 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	792 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	793 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	794 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	795 else
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	796 res = 1;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	797 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	798 res = 1;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	799 return res;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	800 }
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	801
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	802 /* equivalent of 'not v'
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	803 Return -1 if an error occurred */
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	804
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	805 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	806 PyObject_Not(PyObject *v)
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	807 {
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	808 int res;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	809 res = PyObject_IsTrue(v);
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	810 if (res < 0)
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	811 return res;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	812 return res == 0;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	813 }
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	814
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	815 /* 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	816 Increment the reference count on each argument.
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	817 Return -1 and raise an exception if no coercion is possible
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	818 (and then no reference count is incremented).
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	819 */
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	820
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	821 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	822 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	823 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	824 register PyObject v = pv;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	825 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	826 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	827
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	828 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	829 Py_INCREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	830 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	831 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	832 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	833 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	834 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	835 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	836 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	837 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	838 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	839 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	840 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	841 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	842 }
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	843 return 1;
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	844 }
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	845
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	846 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	847 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	848 {
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	849 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	850 if (err <= 0)
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	851 return err;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	852 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	853 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	854 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	855
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	856
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	857 /* Test whether an object can be called */
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	858
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	859 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	860 PyCallable_Check(PyObject *x)
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	861 {
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	862 if (x == NULL)
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	863 return 0;
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	864 if (x->ob_type->tp_call != NULL \|\|
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	865 PyFunction_Check(x) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	866 PyMethod_Check(x) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	867 PyCFunction_Check(x) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	868 PyClass_Check(x))
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	869 return 1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	870 if (PyInstance_Check(x)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	871 PyObject *call = PyObject_GetAttrString(x, "__call__");
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	872 if (call == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	873 PyErr_Clear();
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	874 return 0;
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	875 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	876 /* Could test recursively but don't, for fear of endless
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	877 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	878 Py_DECREF(call);
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	879 return 1;
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	880 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	881 return 0;
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	882 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	883
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	884
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	885 /*
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	886 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	887 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	888 so there is exactly one (which is indestructible, by the way).
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	889 */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	890
739 ab1b3486b226 Fix lint bug Guido van Rossum <guido@python.org> parents: 512 diff changeset	891 /* ARGSUSED */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	892 static PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	893 none_repr(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	894 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	895 return PyString_FromString("None");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	896 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	897
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	898 static PyTypeObject PyNothing_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	899 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	900 0,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	901 "None",
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	902 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	903 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	904 0, /tp_dealloc/ /never called/
1051 f54e64c8b9b7 * Makefile: added IMGFILE; moved some stuff around. Guido van Rossum <guido@python.org> parents: 1017 diff changeset	905 0, /tp_print/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	906 0, /tp_getattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	907 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	908 0, /tp_compare/
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1400 diff changeset	909 (reprfunc)none_repr, /tp_repr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	910 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	911 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	912 0, /tp_as_mapping/
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	913 0, /tp_hash /
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	914 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	915
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	916 PyObject _Py_NoneStruct = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	917 PyObject_HEAD_INIT(&PyNothing_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	918 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	919
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	920
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	921 #ifdef Py_TRACE_REFS
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	922
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	923 static PyObject refchain = {&refchain, &refchain};
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	924
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	925 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	926 _Py_ResetReferences(void)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	927 {
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	928 refchain._ob_prev = refchain._ob_next = &refchain;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	929 _Py_RefTotal = 0;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	930 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	931
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	932 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	933 _Py_NewReference(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	934 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	935 _Py_RefTotal++;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	936 op->ob_refcnt = 1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	937 op->_ob_next = refchain._ob_next;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	938 op->_ob_prev = &refchain;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	939 refchain._ob_next->_ob_prev = op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	940 refchain._ob_next = op;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	941 #ifdef COUNT_ALLOCS
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	942 inc_count(op->ob_type);
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	943 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	944 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	945
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	946 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	947 _Py_ForgetReference(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	948 {
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	949 #ifdef SLOW_UNREF_CHECK
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	950 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	951 #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	952 if (op->ob_refcnt < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	953 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	954 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	955 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	956 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	957 #ifdef SLOW_UNREF_CHECK
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	958 for (p = refchain._ob_next; p != &refchain; p = p->_ob_next) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	959 if (p == op)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	960 break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	961 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	962 if (p == &refchain) /* Not found */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	963 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	964 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	965 op->_ob_next->_ob_prev = op->_ob_prev;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	966 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	967 op->_ob_next = op->_ob_prev = NULL;
2639 f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	968 #ifdef COUNT_ALLOCS
f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	969 op->ob_type->tp_free++;
f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	970 #endif
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	971 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	972
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	973 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	974 _Py_Dealloc(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	975 {
1869 2cede61e9b1b rearranged code in debugging version of DELREF to avoid touching data Guido van Rossum <guido@python.org> parents: 1848 diff changeset	976 destructor dealloc = op->ob_type->tp_dealloc;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	977 _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	978 (*dealloc)(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	979 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	980
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	981 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	982 _Py_PrintReferences(FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	983 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	984 PyObject *op;
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	985 fprintf(fp, "Remaining objects:\n");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	986 for (op = refchain._ob_next; op != &refchain; op = op->_ob_next) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	987 fprintf(fp, "[%d] ", op->ob_refcnt);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	988 if (PyObject_Print(op, fp, 0) != 0)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	989 PyErr_Clear();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	990 putc('\n', fp);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	991 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	992 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	993
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	994 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	995 _Py_GetObjects(PyObject self, PyObject args)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	996 {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	997 int i, n;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	998 PyObject *t = NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	999 PyObject res, op;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1000
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1001 if (!PyArg_ParseTuple(args, "i\|O", &n, &t))
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1002 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1003 op = refchain._ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1004 res = PyList_New(0);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1005 if (res == NULL)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1006 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1007 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	1008 while (op == self \|\| op == args \|\| op == res \|\| op == t \|\|
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1009 t != NULL && op->ob_type != (PyTypeObject *) t) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1010 op = op->_ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1011 if (op == &refchain)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1012 return res;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1013 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1014 if (PyList_Append(res, op) < 0) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1015 Py_DECREF(res);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1016 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1017 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1018 op = op->_ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1019 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1020 return res;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1021 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1022
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1023 #endif
3330 9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1024
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1025
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1026 /* Hack to force loading of cobject.o */
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1027 PyTypeObject *_Py_cobject_hack = &PyCObject_Type;
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1028
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1029
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1030 /* 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	1031 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	1032
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1033
14006 ed369f0aa32b Updated comment Andrew M. Kuchling <amk@amk.ca> parents: 13976 diff changeset	1034 /* 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	1035
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	1036 void *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1037 PyMem_Malloc(size_t nbytes)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1038 {
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1039 #if _PyMem_EXTRA > 0
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1040 if (nbytes == 0)
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1041 nbytes = _PyMem_EXTRA;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1042 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1043 return PyMem_MALLOC(nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1044 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1045
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	1046 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	1047 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	1048 {
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1049 #if _PyMem_EXTRA > 0
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1050 if (nbytes == 0)
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1051 nbytes = _PyMem_EXTRA;
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1052 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1053 return PyMem_REALLOC(p, nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1054 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1055
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1056 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	1057 PyMem_Free(void *p)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1058 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1059 PyMem_FREE(p);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1060 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1061
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1062
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1063 /* 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	1064
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	1065 void *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1066 PyObject_Malloc(size_t nbytes)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1067 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1068 return PyObject_MALLOC(nbytes);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1069 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1070
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	1071 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	1072 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	1073 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1074 return PyObject_REALLOC(p, nbytes);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1075 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1076
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1077 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	1078 PyObject_Free(void *p)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1079 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1080 PyObject_FREE(p);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1081 }
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1082
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1083
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1084 /* 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	1085 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	1086 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	1087 Py_ReprLeave() to avoid infinite recursion.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1088
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1089 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	1090 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	1091 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	1092
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1093 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	1094 */
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1095
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1096 #define KEY "Py_Repr"
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1097
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1098 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1099 Py_ReprEnter(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1100 {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1101 PyObject *dict;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1102 PyObject *list;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1103 int i;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1104
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1105 dict = PyThreadState_GetDict();
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1106 if (dict == NULL)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1107 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1108 list = PyDict_GetItemString(dict, KEY);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1109 if (list == NULL) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1110 list = PyList_New(0);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1111 if (list == NULL)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1112 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1113 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	1114 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1115 Py_DECREF(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1116 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1117 i = PyList_GET_SIZE(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1118 while (--i >= 0) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1119 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	1120 return 1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1121 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1122 PyList_Append(list, obj);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1123 return 0;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1124 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1125
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1126 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1127 Py_ReprLeave(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1128 {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1129 PyObject *dict;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1130 PyObject *list;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1131 int i;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1132
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1133 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	1134 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	1135 return;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1136 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	1137 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	1138 return;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1139 i = PyList_GET_SIZE(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1140 /* 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	1141 while (--i >= 0) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1142 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	1143 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	1144 break;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1145 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1146 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1147 }
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1148
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1149 /*
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1150 trashcan
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1151 CT 2k0130
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1152 non-recursively destroy nested objects
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1153
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1154 CT 2k0223
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1155 everything is now done in a macro.
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1156
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1157 CT 2k0305
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1158 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	1159
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1160 CT 2k0309
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1161 modified to restore a possible error.
12052 5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1162
5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1163 CT 2k0325
5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1164 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	1165
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1166 CT 2k0422
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1167 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	1168 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	1169 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	1170 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	1171 */
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1172
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1173 #define Py_TRASHCAN_TUPLE 1
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1174 #define Py_TRASHCAN_LIST 2
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1175 #define Py_TRASHCAN_DICT 3
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1176 #define Py_TRASHCAN_FRAME 4
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1177 #define Py_TRASHCAN_TRACEBACK 5
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1178 /* 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	1179
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1180 int _PyTrash_delete_nesting = 0;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1181
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1182 PyObject * _PyTrash_delete_later = NULL;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1183
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1184 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1185 _PyTrash_deposit_object(PyObject *op)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1186 {
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1187 int typecode;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1188
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1189 if (PyTuple_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1190 typecode = Py_TRASHCAN_TUPLE;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1191 else if (PyList_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1192 typecode = Py_TRASHCAN_LIST;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1193 else if (PyDict_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1194 typecode = Py_TRASHCAN_DICT;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1195 else if (PyFrame_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1196 typecode = Py_TRASHCAN_FRAME;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1197 else if (PyTraceBack_Check(op))
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1198 typecode = Py_TRASHCAN_TRACEBACK;
13861 f3d5f71ccbb4 Removing warnings found by gcc -Wall Moshe Zadka <moshez@math.huji.ac.il> parents: 13761 diff changeset	1199 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	1200 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	1201 return; /* pacify compiler -- execution never here */
f3d5f71ccbb4 Removing warnings found by gcc -Wall Moshe Zadka <moshez@math.huji.ac.il> parents: 13761 diff changeset	1202 }
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1203 op->ob_refcnt = typecode;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1204
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1205 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	1206 _PyTrash_delete_later = op;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1207 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1208
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1209 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1210 _PyTrash_destroy_chain(void)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1211 {
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1212 while (_PyTrash_delete_later) {
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1213 PyObject *shredder = _PyTrash_delete_later;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1214 _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	1215
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1216 switch (shredder->ob_refcnt) {
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1217 case Py_TRASHCAN_TUPLE:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1218 shredder->ob_type = &PyTuple_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1219 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1220 case Py_TRASHCAN_LIST:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1221 shredder->ob_type = &PyList_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1222 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1223 case Py_TRASHCAN_DICT:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1224 shredder->ob_type = &PyDict_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1225 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1226 case Py_TRASHCAN_FRAME:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1227 shredder->ob_type = &PyFrame_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1228 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1229 case Py_TRASHCAN_TRACEBACK:
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1230 shredder->ob_type = &PyTraceBack_Type;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1231 break;
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1232 }
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1233 _Py_NewReference(shredder);
a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1234
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1235 ++_PyTrash_delete_nesting;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1236 Py_DECREF(shredder);
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1237 --_PyTrash_delete_nesting;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1238 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1239 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/object.c @ 15164:8930ec3bc00a legacy-trunk