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

annotate Objects/intobject.c @ 25838:8540887bcec6 2.2

Backport of 2.183: Fix memory leak in add_subclass() found by NealN with valgrind.

author	Guido van Rossum <guido@python.org>
date	Fri, 18 Oct 2002 13:42:21 +0000
parents	786e0e9a5f7f
children	de801733ec18

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Integer object implementation */
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: 4952 diff changeset	4 #include "Python.h"
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	5 #include <ctype.h>
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
1448 328f446d2016 Added getmaxint() so sys can initialize sys.maxint. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	7 long
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	8 PyInt_GetMax(void)
1448 328f446d2016 Added getmaxint() so sys can initialize sys.maxint. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	9 {
328f446d2016 Added getmaxint() so sys can initialize sys.maxint. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	10 return LONG_MAX; /* To initialize sys.maxint */
328f446d2016 Added getmaxint() so sys can initialize sys.maxint. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	11 }
328f446d2016 Added getmaxint() so sys can initialize sys.maxint. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	12
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	13 /* Standard Booleans */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	14
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	15 PyIntObject _Py_ZeroStruct = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	16 PyObject_HEAD_INIT(&PyInt_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 0
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	18 };
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	19
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	20 PyIntObject _Py_TrueStruct = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	21 PyObject_HEAD_INIT(&PyInt_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	22 1
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	23 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	25 /* Return 1 if exception raised, 0 if caller should retry using longs */
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	26 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	27 err_ovf(char *msg)
11 bcea6c822906 New error handling. Guido van Rossum <guido@python.org> parents: 6 diff changeset	28 {
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	29 if (PyErr_Warn(PyExc_OverflowWarning, msg) < 0) {
19455 25b9b634d9e3 err_ovf(): only raise OverflowError when OverflowWarning was raised. Guido van Rossum <guido@python.org> parents: 19454 diff changeset	30 if (PyErr_ExceptionMatches(PyExc_OverflowWarning))
25b9b634d9e3 err_ovf(): only raise OverflowError when OverflowWarning was raised. Guido van Rossum <guido@python.org> parents: 19454 diff changeset	31 PyErr_SetString(PyExc_OverflowError, msg);
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	32 return 1;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	33 }
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	34 else
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	35 return 0;
11 bcea6c822906 New error handling. Guido van Rossum <guido@python.org> parents: 6 diff changeset	36 }
bcea6c822906 New error handling. Guido van Rossum <guido@python.org> parents: 6 diff changeset	37
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	38 /* Integers are quite normal objects, to make object handling uniform.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	39 (Using odd pointers to represent integers would save much space
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	40 but require extra checks for this special case throughout the code.)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	41 Since, a typical Python program spends much of its time allocating
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	42 and deallocating integers, these operations should be very fast.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	43 Therefore we use a dedicated allocation scheme with a much lower
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	44 overhead (in space and time) than straight malloc(): a simple
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	45 dedicated free list, filled when necessary with memory from malloc().
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	46 */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	47
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	48 #define BLOCK_SIZE 1000 /* 1K less typical malloc overhead */
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	49 #define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	50 #define N_INTOBJECTS ((BLOCK_SIZE - BHEAD_SIZE) / sizeof(PyIntObject))
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	51
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	52 struct _intblock {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	53 struct _intblock *next;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	54 PyIntObject objects[N_INTOBJECTS];
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	55 };
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	56
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	57 typedef struct _intblock PyIntBlock;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	58
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	59 static PyIntBlock *block_list = NULL;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	60 static PyIntObject *free_list = NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	61
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	62 static PyIntObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	63 fill_free_list(void)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	64 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	65 PyIntObject p, q;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	66 /* XXX Int blocks escape the object heap. Use PyObject_MALLOC ??? */
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	67 p = (PyIntObject *) PyMem_MALLOC(sizeof(PyIntBlock));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	68 if (p == NULL)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	69 return (PyIntObject *) PyErr_NoMemory();
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	70 ((PyIntBlock *)p)->next = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	71 block_list = (PyIntBlock *)p;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	72 p = &((PyIntBlock *)p)->objects[0];
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	73 q = p + N_INTOBJECTS;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	74 while (--q > p)
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	75 q->ob_type = (struct _typeobject *)(q-1);
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	76 q->ob_type = NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	77 return p + N_INTOBJECTS - 1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	78 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	79
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	80 #ifndef NSMALLPOSINTS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	81 #define NSMALLPOSINTS 100
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	82 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	83 #ifndef NSMALLNEGINTS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	84 #define NSMALLNEGINTS 1
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	85 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	86 #if NSMALLNEGINTS + NSMALLPOSINTS > 0
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	87 /* References to small integers are saved in this array so that they
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	88 can be shared.
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	89 The integers that are saved are those in the range
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	90 -NSMALLNEGINTS (inclusive) to NSMALLPOSINTS (not inclusive).
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	91 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	92 static PyIntObject *small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	93 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	94 #ifdef COUNT_ALLOCS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	95 int quick_int_allocs, quick_neg_int_allocs;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	96 #endif
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	97
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	98 PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	99 PyInt_FromLong(long ival)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	100 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	101 register PyIntObject *v;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	102 #if NSMALLNEGINTS + NSMALLPOSINTS > 0
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	103 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS &&
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	104 (v = small_ints[ival + NSMALLNEGINTS]) != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	105 Py_INCREF(v);
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	106 #ifdef COUNT_ALLOCS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	107 if (ival >= 0)
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	108 quick_int_allocs++;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	109 else
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	110 quick_neg_int_allocs++;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	111 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	112 return (PyObject *) v;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	113 }
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	114 #endif
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	115 if (free_list == NULL) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	116 if ((free_list = fill_free_list()) == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	117 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	118 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	119 /* PyObject_New is inlined */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	120 v = free_list;
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	121 free_list = (PyIntObject *)v->ob_type;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	122 PyObject_INIT(v, &PyInt_Type);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	123 v->ob_ival = ival;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	124 #if NSMALLNEGINTS + NSMALLPOSINTS > 0
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	125 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) {
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	126 /* save this one for a following allocation */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	127 Py_INCREF(v);
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	128 small_ints[ival + NSMALLNEGINTS] = v;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	129 }
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	130 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	131 return (PyObject *) v;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	132 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	133
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	134 static void
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	135 int_dealloc(PyIntObject *v)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 39 diff changeset	136 {
19865 f2a3009b528e Replace a few places where X->ob_type was compared to &PyXXX_Type with Guido van Rossum <guido@python.org> parents: 19719 diff changeset	137 if (PyInt_CheckExact(v)) {
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	138 v->ob_type = (struct _typeobject *)free_list;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	139 free_list = v;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	140 }
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	141 else
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	142 v->ob_type->tp_free((PyObject *)v);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	143 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	144
23283 3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	145 static void
3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	146 int_free(PyIntObject *v)
3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	147 {
3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	148 v->ob_type = (struct _typeobject *)free_list;
3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	149 free_list = v;
3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	150 }
3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	151
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	152 long
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	153 PyInt_AsLong(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	154 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	155 PyNumberMethods *nb;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	156 PyIntObject *io;
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	157 long val;
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	158
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	159 if (op && PyInt_Check(op))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	160 return PyInt_AS_LONG((PyIntObject*) op);
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	161
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	162 if (op == NULL \|\| (nb = op->ob_type->tp_as_number) == NULL \|\|
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	163 nb->nb_int == NULL) {
12630 57d4fc8308e3 Replace PyErr_BadArgument() error in PyInt_AsLong() with "an integer Guido van Rossum <guido@python.org> parents: 12576 diff changeset	164 PyErr_SetString(PyExc_TypeError, "an integer is required");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	165 return -1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	166 }
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	167
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	168 io = (PyIntObject) (nb->nb_int) (op);
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	169 if (io == NULL)
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	170 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	171 if (!PyInt_Check(io)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	172 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	173 "nb_int should return int object");
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	174 return -1;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	175 }
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	176
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	177 val = PyInt_AS_LONG(io);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	178 Py_DECREF(io);
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	179
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	180 return val;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	181 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	182
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	183 PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	184 PyInt_FromString(char s, char *pend, int base)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	185 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	186 char *end;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	187 long x;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	188 char buffer[256]; /* For errors */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	189
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	190 if ((base != 0 && base < 2) \|\| base > 36) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15041 diff changeset	191 PyErr_SetString(PyExc_ValueError, "int() base must be >= 2 and <= 36");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	192 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	193 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	194
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	195 while (s && isspace(Py_CHARMASK(s)))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	196 s++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	197 errno = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	198 if (base == 0 && s[0] == '0')
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	199 x = (long) PyOS_strtoul(s, &end, base);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	200 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	201 x = PyOS_strtol(s, &end, base);
16997 86fd723f2928 Use Py_CHARMASK for ctype macros. Fixes bug #232787. Martin v. Löwis <martin@v.loewis.de> parents: 15945 diff changeset	202 if (end == s \|\| !isalnum(Py_CHARMASK(end[-1])))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	203 goto bad;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	204 while (end && isspace(Py_CHARMASK(end)))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	205 end++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	206 if (*end != '\0') {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	207 bad:
21080 5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	208 PyOS_snprintf(buffer, sizeof(buffer),
5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	209 "invalid literal for int(): %.200s", s);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	210 PyErr_SetString(PyExc_ValueError, buffer);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	211 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	212 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	213 else if (errno != 0) {
21080 5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	214 PyOS_snprintf(buffer, sizeof(buffer),
5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	215 "int() literal too large: %.200s", s);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	216 PyErr_SetString(PyExc_ValueError, buffer);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	217 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	218 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	219 if (pend)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	220 *pend = end;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	221 return PyInt_FromLong(x);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	222 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 11332 diff changeset	223
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	224 #ifdef Py_USING_UNICODE
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	225 PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	226 PyInt_FromUnicode(Py_UNICODE *s, int length, int base)
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	227 {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	228 char buffer[256];
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	229
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	230 if (length >= sizeof(buffer)) {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	231 PyErr_SetString(PyExc_ValueError,
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	232 "int() literal too large to convert");
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	233 return NULL;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	234 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	235 if (PyUnicode_EncodeDecimal(s, length, buffer, NULL))
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	236 return NULL;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	237 return PyInt_FromString(buffer, NULL, base);
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	238 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	239 #endif
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	240
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	241 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	242
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	243 /* Integers are seen as the "smallest" of all numeric types and thus
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	244 don't have any knowledge about conversion of other types to
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	245 integers. */
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	246
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	247 #define CONVERT_TO_LONG(obj, lng) \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	248 if (PyInt_Check(obj)) { \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	249 lng = PyInt_AS_LONG(obj); \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	250 } \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	251 else { \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	252 Py_INCREF(Py_NotImplemented); \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	253 return Py_NotImplemented; \
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	254 }
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	255
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 610 diff changeset	256 /* ARGSUSED */
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 240 diff changeset	257 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	258 int_print(PyIntObject v, FILE fp, int flags)
dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	259 /* flags -- not used but required by interface */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	260 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	261 fprintf(fp, "%ld", v->ob_ival);
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 240 diff changeset	262 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	263 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	264
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	265 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	266 int_repr(PyIntObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	267 {
21124 21bb4c4b7e26 SF bug #487743: test_builtin fails on 64 bit platform. Tim Peters <tim.peters@gmail.com> parents: 21080 diff changeset	268 char buf[64];
21080 5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	269 PyOS_snprintf(buf, sizeof(buf), "%ld", v->ob_ival);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	270 return PyString_FromString(buf);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	271 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	272
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	273 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	274 int_compare(PyIntObject v, PyIntObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	275 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	276 register long i = v->ob_ival;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	277 register long j = w->ob_ival;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	278 return (i < j) ? -1 : (i > j) ? 1 : 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	279 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	280
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	281 static long
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	282 int_hash(PyIntObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	283 {
4903 6a629d278a18 Fix overflow test for multiply to catch some cases it missed. Guido van Rossum <guido@python.org> parents: 4606 diff changeset	284 /* XXX If this is changed, you also need to change the way
6a629d278a18 Fix overflow test for multiply to catch some cases it missed. Guido van Rossum <guido@python.org> parents: 4606 diff changeset	285 Python's long, float and complex types are hashed. */
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	286 long x = v -> ob_ival;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	287 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	288 x = -2;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	289 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	290 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	291
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	292 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	293 int_add(PyIntObject v, PyIntObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	294 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	295 register long a, b, x;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	296 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	297 CONVERT_TO_LONG(w, b);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	298 x = a + b;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	299 if ((x^a) >= 0 \|\| (x^b) >= 0)
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	300 return PyInt_FromLong(x);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	301 if (err_ovf("integer addition"))
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	302 return NULL;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	303 return PyLong_Type.tp_as_number->nb_add((PyObject )v, (PyObject )w);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	304 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	305
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	306 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	307 int_sub(PyIntObject v, PyIntObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309 register long a, b, x;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	310 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	311 CONVERT_TO_LONG(w, b);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	312 x = a - b;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	313 if ((x^a) >= 0 \|\| (x^~b) >= 0)
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	314 return PyInt_FromLong(x);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	315 if (err_ovf("integer subtraction"))
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	316 return NULL;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	317 return PyLong_Type.tp_as_number->nb_subtract((PyObject *)v,
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	318 (PyObject *)w);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	320
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	321 /*
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	322 Integer overflow checking for * is painful: Python tried a couple ways, but
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	323 they didn't work on all platforms, or failed in endcases (a product of
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	324 -sys.maxint-1 has been a particular pain).
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	325
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	326 Here's another way:
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	327
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	328 The native long product xy is either exactly right or way* off, being
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	329 just the last n bits of the true product, where n is the number of bits
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	330 in a long (the delivered product is the true product plus i2*n for
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	331 some integer i).
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	332
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	333 The native double product (double)x * (double)y is subject to three
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	334 rounding errors: on a sizeof(long)==8 box, each cast to double can lose
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	335 info, and even on a sizeof(long)==4 box, the multiplication can lose info.
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	336 But, unlike the native long product, it's not in range trouble: even
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	337 if sizeof(long)==32 (256-bit longs), the product easily fits in the
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	338 dynamic range of a double. So the leading 50 (or so) bits of the double
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	339 product are correct.
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	340
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	341 We check these two ways against each other, and declare victory if they're
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	342 approximately the same. Else, because the native long product is the only
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	343 one that can lose catastrophic amounts of information, it's the native long
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	344 product that must have overflowed.
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	345 */
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	346
24704 564abb98deb8 Only call sq_repeat if the object does not have a nb_multiply slot. One Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23283 diff changeset	347 /* Return true if the sq_repeat method should be used */
564abb98deb8 Only call sq_repeat if the object does not have a nb_multiply slot. One Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23283 diff changeset	348 #define USE_SQ_REPEAT(o) (!PyInt_Check(o) && \
564abb98deb8 Only call sq_repeat if the object does not have a nb_multiply slot. One Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23283 diff changeset	349 o->ob_type->tp_as_sequence && \
564abb98deb8 Only call sq_repeat if the object does not have a nb_multiply slot. One Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23283 diff changeset	350 o->ob_type->tp_as_sequence->sq_repeat && \
24781 fae386d5e354 Backport: Guido van Rossum <guido@python.org> parents: 24704 diff changeset	351 !(o->ob_type->tp_as_number && \
fae386d5e354 Backport: Guido van Rossum <guido@python.org> parents: 24704 diff changeset	352 o->ob_type->tp_flags & Py_TPFLAGS_CHECKTYPES && \
fae386d5e354 Backport: Guido van Rossum <guido@python.org> parents: 24704 diff changeset	353 o->ob_type->tp_as_number->nb_multiply))
fae386d5e354 Backport: Guido van Rossum <guido@python.org> parents: 24704 diff changeset	354
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	355 static PyObject *
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	356 int_mul(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	357 {
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	358 long a, b;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	359 long longprod; /* ab in native long arithmetic /
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	360 double doubled_longprod; /* (double)longprod */
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	361 double doubleprod; /* (double)a * (double)b */
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	362
24704 564abb98deb8 Only call sq_repeat if the object does not have a nb_multiply slot. One Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23283 diff changeset	363 if (USE_SQ_REPEAT(v)) {
25368 786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	364 repeat:
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	365 /* sequence * int */
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	366 a = PyInt_AsLong(w);
25368 786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	367 #if LONG_MAX != INT_MAX
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	368 if (a > INT_MAX) {
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	369 PyErr_SetString(PyExc_ValueError,
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	370 "sequence repeat count too large");
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	371 return NULL;
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	372 }
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	373 else if (a < INT_MIN)
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	374 a = INT_MIN;
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	375 /* XXX Why don't I either
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	376
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	377 - set a to -1 whenever it's negative (after all,
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	378 sequence repeat usually treats negative numbers
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	379 as zero(); or
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	380
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	381 - raise an exception when it's less than INT_MIN?
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	382
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	383 I'm thinking about a hypothetical use case where some
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	384 sequence type might use a negative value as a flag of
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	385 some kind. In those cases I don't want to break the
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	386 code by mapping all negative values to -1. But I also
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	387 don't want to break e.g. []*(-sys.maxint), which is
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	388 perfectly safe, returning []. As a compromise, I do
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	389 map out-of-range negative values.
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	390 */
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	391 #endif
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	392 return (*v->ob_type->tp_as_sequence->sq_repeat)(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	393 }
24704 564abb98deb8 Only call sq_repeat if the object does not have a nb_multiply slot. One Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23283 diff changeset	394 if (USE_SQ_REPEAT(w)) {
25368 786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	395 PyObject *tmp = v;
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	396 v = w;
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	397 w = tmp;
786e0e9a5f7f Backport 2.93 from trunk: Guido van Rossum <guido@python.org> parents: 24781 diff changeset	398 goto repeat;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	399 }
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	400
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	401 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	402 CONVERT_TO_LONG(w, b);
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	403 longprod = a * b;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	404 doubleprod = (double)a * (double)b;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	405 doubled_longprod = (double)longprod;
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	406
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	407 /* Fast path for normal case: small multiplicands, and no info
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	408 is lost in either method. */
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	409 if (doubled_longprod == doubleprod)
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	410 return PyInt_FromLong(longprod);
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	411
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	412 /* Somebody somewhere lost info. Close enough, or way off? Note
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	413 that a != 0 and b != 0 (else doubled_longprod == doubleprod == 0).
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	414 The difference either is or isn't significant compared to the
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	415 true value (of which doubleprod is a good approximation).
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	416 */
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	417 {
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	418 const double diff = doubled_longprod - doubleprod;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	419 const double absdiff = diff >= 0.0 ? diff : -diff;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	420 const double absprod = doubleprod >= 0.0 ? doubleprod :
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	421 -doubleprod;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	422 /* absdiff/absprod <= 1/32 iff
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	423 32 * absdiff <= absprod -- 5 good bits is "close enough" */
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	424 if (32.0 * absdiff <= absprod)
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	425 return PyInt_FromLong(longprod);
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	426 else if (err_ovf("integer multiplication"))
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	427 return NULL;
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	428 else
81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	429 return PyLong_Type.tp_as_number->nb_multiply(v, w);
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	430 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	431 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	432
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	433 /* Return type of i_divmod */
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	434 enum divmod_result {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	435 DIVMOD_OK, /* Correct result */
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	436 DIVMOD_OVERFLOW, /* Overflow, try again using longs */
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	437 DIVMOD_ERROR /* Exception raised */
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	438 };
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	439
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	440 static enum divmod_result
18146 b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	441 i_divmod(register long x, register long y,
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	442 long p_xdivy, long p_xmody)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	443 {
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	444 long xdivy, xmody;
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	445
18146 b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	446 if (y == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	447 PyErr_SetString(PyExc_ZeroDivisionError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15041 diff changeset	448 "integer division or modulo by zero");
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	449 return DIVMOD_ERROR;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	450 }
18146 b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	451 /* (-sys.maxint-1)/-1 is the only overflow case. */
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	452 if (y == -1 && x < 0 && x == -x) {
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	453 if (err_ovf("integer division"))
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	454 return DIVMOD_ERROR;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	455 return DIVMOD_OVERFLOW;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	456 }
18146 b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	457 xdivy = x / y;
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	458 xmody = x - xdivy * y;
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	459 /* If the signs of x and y differ, and the remainder is non-0,
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	460 * C89 doesn't define whether xdivy is now the floor or the
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	461 * ceiling of the infinitely precise quotient. We want the floor,
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	462 * and we have it iff the remainder's sign matches y's.
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	463 */
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	464 if (xmody && ((y ^ xmody) < 0) /* i.e. and signs differ */) {
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	465 xmody += y;
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	466 --xdivy;
b51b4c2bf5f9 SF bug 434186: 0x80000000/2 != 0x80000000>>1 Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	467 assert(xmody && ((y ^ xmody) >= 0));
229 08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	468 }
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	469 *p_xdivy = xdivy;
dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	470 *p_xmody = xmody;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	471 return DIVMOD_OK;
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	472 }
dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	473
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	474 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	475 int_div(PyIntObject x, PyIntObject y)
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	476 {
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	477 long xi, yi;
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	478 long d, m;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	479 CONVERT_TO_LONG(x, xi);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	480 CONVERT_TO_LONG(y, yi);
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	481 switch (i_divmod(xi, yi, &d, &m)) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	482 case DIVMOD_OK:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	483 return PyInt_FromLong(d);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	484 case DIVMOD_OVERFLOW:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	485 return PyLong_Type.tp_as_number->nb_divide((PyObject *)x,
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	486 (PyObject *)y);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	487 default:
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	488 return NULL;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	489 }
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	490 }
dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	491
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	492 static PyObject *
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	493 int_classic_div(PyIntObject x, PyIntObject y)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	494 {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	495 long xi, yi;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	496 long d, m;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	497 CONVERT_TO_LONG(x, xi);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	498 CONVERT_TO_LONG(y, yi);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	499 if (Py_DivisionWarningFlag &&
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	500 PyErr_Warn(PyExc_DeprecationWarning, "classic int division") < 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	501 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	502 switch (i_divmod(xi, yi, &d, &m)) {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	503 case DIVMOD_OK:
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	504 return PyInt_FromLong(d);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	505 case DIVMOD_OVERFLOW:
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	506 return PyLong_Type.tp_as_number->nb_divide((PyObject *)x,
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	507 (PyObject *)y);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	508 default:
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	509 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	510 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	511 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	512
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	513 static PyObject *
19676 c768d3191df1 Move int_true_divide next to the other division routines. Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	514 int_true_divide(PyObject v, PyObject w)
c768d3191df1 Move int_true_divide next to the other division routines. Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	515 {
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	516 /* If they aren't both ints, give someone else a chance. In
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	517 particular, this lets int/long get handled by longs, which
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	518 underflows to 0 gracefully if the long is too big to convert
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	519 to float. */
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	520 if (PyInt_Check(v) && PyInt_Check(w))
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	521 return PyFloat_Type.tp_as_number->nb_true_divide(v, w);
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	522 Py_INCREF(Py_NotImplemented);
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19676 diff changeset	523 return Py_NotImplemented;
19676 c768d3191df1 Move int_true_divide next to the other division routines. Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	524 }
c768d3191df1 Move int_true_divide next to the other division routines. Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	525
c768d3191df1 Move int_true_divide next to the other division routines. Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	526 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	527 int_mod(PyIntObject x, PyIntObject y)
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	528 {
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	529 long xi, yi;
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	530 long d, m;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	531 CONVERT_TO_LONG(x, xi);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	532 CONVERT_TO_LONG(y, yi);
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	533 switch (i_divmod(xi, yi, &d, &m)) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	534 case DIVMOD_OK:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	535 return PyInt_FromLong(m);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	536 case DIVMOD_OVERFLOW:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	537 return PyLong_Type.tp_as_number->nb_remainder((PyObject *)x,
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	538 (PyObject *)y);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	539 default:
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	540 return NULL;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	541 }
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	542 }
dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	543
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	544 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	545 int_divmod(PyIntObject x, PyIntObject y)
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	546 {
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	547 long xi, yi;
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	548 long d, m;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	549 CONVERT_TO_LONG(x, xi);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	550 CONVERT_TO_LONG(y, yi);
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	551 switch (i_divmod(xi, yi, &d, &m)) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	552 case DIVMOD_OK:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	553 return Py_BuildValue("(ll)", d, m);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	554 case DIVMOD_OVERFLOW:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	555 return PyLong_Type.tp_as_number->nb_divmod((PyObject *)x,
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	556 (PyObject *)y);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	557 default:
610 dcc6de1c37a4 Make / and % do the same as divmod. Guido van Rossum <guido@python.org> parents: 589 diff changeset	558 return NULL;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	559 }
229 08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	560 }
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	561
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	562 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	563 int_pow(PyIntObject v, PyIntObject w, PyIntObject *z)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	564 {
4606 739b8480f1ac Fix core dump from pow(x,y,0). Guido van Rossum <guido@python.org> parents: 4503 diff changeset	565 register long iv, iw, iz=0, ix, temp, prev;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	566 CONVERT_TO_LONG(v, iv);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	567 CONVERT_TO_LONG(w, iw);
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	568 if (iw < 0) {
19666 cf65ebf87560 New restriction on pow(x, y, z): If z is not None, x and y must be of Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	569 if ((PyObject *)z != Py_None) {
19719 cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19677 diff changeset	570 PyErr_SetString(PyExc_TypeError, "pow() 2nd argument "
cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19677 diff changeset	571 "cannot be negative when 3rd argument specified");
19666 cf65ebf87560 New restriction on pow(x, y, z): If z is not None, x and y must be of Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	572 return NULL;
cf65ebf87560 New restriction on pow(x, y, z): If z is not None, x and y must be of Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	573 }
18499 2bb75a1f3184 On int to the negative integral power, let float handle it instead of Guido van Rossum <guido@python.org> parents: 18146 diff changeset	574 /* Return a float. This works because we know that
2bb75a1f3184 On int to the negative integral power, let float handle it instead of Guido van Rossum <guido@python.org> parents: 18146 diff changeset	575 this calls float_pow() which converts its
2bb75a1f3184 On int to the negative integral power, let float handle it instead of Guido van Rossum <guido@python.org> parents: 18146 diff changeset	576 arguments to double. */
2bb75a1f3184 On int to the negative integral power, let float handle it instead of Guido van Rossum <guido@python.org> parents: 18146 diff changeset	577 return PyFloat_Type.tp_as_number->nb_power(
2bb75a1f3184 On int to the negative integral power, let float handle it instead of Guido van Rossum <guido@python.org> parents: 18146 diff changeset	578 (PyObject )v, (PyObject )w, (PyObject *)z);
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	579 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	580 if ((PyObject *)z != Py_None) {
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	581 CONVERT_TO_LONG(z, iz);
4606 739b8480f1ac Fix core dump from pow(x,y,0). Guido van Rossum <guido@python.org> parents: 4503 diff changeset	582 if (iz == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	583 PyErr_SetString(PyExc_ValueError,
19719 cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19677 diff changeset	584 "pow() 3rd argument cannot be 0");
4606 739b8480f1ac Fix core dump from pow(x,y,0). Guido van Rossum <guido@python.org> parents: 4503 diff changeset	585 return NULL;
739b8480f1ac Fix core dump from pow(x,y,0). Guido van Rossum <guido@python.org> parents: 4503 diff changeset	586 }
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	587 }
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	588 /*
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	589 * XXX: The original exponentiation code stopped looping
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	590 * when temp hit zero; this code will continue onwards
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	591 * unnecessarily, but at least it won't cause any errors.
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	592 * Hopefully the speed improvement from the fast exponentiation
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	593 * will compensate for the slight inefficiency.
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	594 * XXX: Better handling of overflows is desperately needed.
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	595 */
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	596 temp = iv;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	597 ix = 1;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	598 while (iw > 0) {
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	599 prev = ix; /* Save value for overflow check */
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	600 if (iw & 1) {
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	601 ix = ix*temp;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	602 if (temp == 0)
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	603 break; /* Avoid ix / 0 */
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	604 if (ix / temp != prev) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	605 if (err_ovf("integer exponentiation"))
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	606 return NULL;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	607 return PyLong_Type.tp_as_number->nb_power(
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	608 (PyObject *)v,
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	609 (PyObject *)w,
19454 9afd9d5fb97a int_pow(): Repair typo when passing on to float pow (the 2nd argument was Tim Peters <tim.peters@gmail.com> parents: 19435 diff changeset	610 (PyObject *)z);
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	611 }
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	612 }
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	613 iw >>= 1; /* Shift exponent down by 1 bit */
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	614 if (iw==0) break;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	615 prev = temp;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	616 temp = temp; / Square the value of temp */
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	617 if (prev!=0 && temp/prev!=prev) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	618 if (err_ovf("integer exponentiation"))
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	619 return NULL;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	620 return PyLong_Type.tp_as_number->nb_power(
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	621 (PyObject )v, (PyObject )w, (PyObject *)z);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	622 }
4606 739b8480f1ac Fix core dump from pow(x,y,0). Guido van Rossum <guido@python.org> parents: 4503 diff changeset	623 if (iz) {
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	624 /* If we did a multiplication, perform a modulo */
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	625 ix = ix % iz;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	626 temp = temp % iz;
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	627 }
5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	628 }
4606 739b8480f1ac Fix core dump from pow(x,y,0). Guido van Rossum <guido@python.org> parents: 4503 diff changeset	629 if (iz) {
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	630 long div, mod;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	631 switch (i_divmod(ix, iz, &div, &mod)) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	632 case DIVMOD_OK:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	633 ix = mod;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	634 break;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	635 case DIVMOD_OVERFLOW:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	636 return PyLong_Type.tp_as_number->nb_power(
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	637 (PyObject )v, (PyObject )w, (PyObject *)z);
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	638 default:
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	639 return NULL;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	640 }
1838 5f6acd1ab5c5 mods by Andrew Kuchling to implement Guido van Rossum <guido@python.org> parents: 1448 diff changeset	641 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	642 return PyInt_FromLong(ix);
21206 81928c9d7011 SF bug #488480: integer multiply to return -max_int-1. Tim Peters <tim.peters@gmail.com> parents: 21124 diff changeset	643 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	644
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	645 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	646 int_neg(PyIntObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	647 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	648 register long a, x;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	649 a = v->ob_ival;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	650 x = -a;
19435 dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	651 if (a < 0 && x < 0) {
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	652 if (err_ovf("integer negation"))
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	653 return NULL;
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	654 return PyNumber_Negative(PyLong_FromLong(a));
dad3209ce973 Change all case where we used to raise OverflowError to issue a Guido van Rossum <guido@python.org> parents: 19343 diff changeset	655 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	656 return PyInt_FromLong(x);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	657 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	658
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	659 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	660 int_pos(PyIntObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	661 {
19878 cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	662 if (PyInt_CheckExact(v)) {
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	663 Py_INCREF(v);
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	664 return (PyObject *)v;
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	665 }
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	666 else
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	667 return PyInt_FromLong(v->ob_ival);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	668 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	669
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	670 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	671 int_abs(PyIntObject *v)
229 08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	672 {
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	673 if (v->ob_ival >= 0)
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	674 return int_pos(v);
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	675 else
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	676 return int_neg(v);
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	677 }
08597e2b63d3 Added divmod and abs, fixed negative powers Guido van Rossum <guido@python.org> parents: 145 diff changeset	678
240 0aad3a7b97ef Added nonzero test Guido van Rossum <guido@python.org> parents: 229 diff changeset	679 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	680 int_nonzero(PyIntObject *v)
240 0aad3a7b97ef Added nonzero test Guido van Rossum <guido@python.org> parents: 229 diff changeset	681 {
0aad3a7b97ef Added nonzero test Guido van Rossum <guido@python.org> parents: 229 diff changeset	682 return v->ob_ival != 0;
0aad3a7b97ef Added nonzero test Guido van Rossum <guido@python.org> parents: 229 diff changeset	683 }
0aad3a7b97ef Added nonzero test Guido van Rossum <guido@python.org> parents: 229 diff changeset	684
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	685 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	686 int_invert(PyIntObject *v)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	687 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	688 return PyInt_FromLong(~v->ob_ival);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	689 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	690
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	691 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	692 int_lshift(PyIntObject v, PyIntObject w)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	693 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	694 register long a, b;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	695 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	696 CONVERT_TO_LONG(w, b);
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	697 if (b < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	698 PyErr_SetString(PyExc_ValueError, "negative shift count");
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	699 return NULL;
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	700 }
19878 cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	701 if (a == 0 \|\| b == 0)
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	702 return int_pos(v);
1365 a5fc104849aa Changes to make range checks portable to 64-bit machines. Guido van Rossum <guido@python.org> parents: 1352 diff changeset	703 if (b >= LONG_BIT) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	704 return PyInt_FromLong(0L);
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	705 }
18755 f8bd14aef4d6 Kill more warnings from the SGI compiler. Fred Drake <fdrake@acm.org> parents: 18499 diff changeset	706 a = (long)((unsigned long)a << b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	707 return PyInt_FromLong(a);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	708 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	709
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	710 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	711 int_rshift(PyIntObject v, PyIntObject w)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	712 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	713 register long a, b;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	714 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	715 CONVERT_TO_LONG(w, b);
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	716 if (b < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	717 PyErr_SetString(PyExc_ValueError, "negative shift count");
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	718 return NULL;
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	719 }
19878 cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	720 if (a == 0 \|\| b == 0)
cc146ee52897 More bug 460020. When I is a subclass of int, disable the +I(whatever), Tim Peters <tim.peters@gmail.com> parents: 19865 diff changeset	721 return int_pos(v);
1365 a5fc104849aa Changes to make range checks portable to 64-bit machines. Guido van Rossum <guido@python.org> parents: 1352 diff changeset	722 if (b >= LONG_BIT) {
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	723 if (a < 0)
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	724 a = -1;
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	725 else
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	726 a = 0;
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	727 }
6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	728 else {
13423 a87803eb9dfb Cray J90 fixes for long ints. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	729 a = Py_ARITHMETIC_RIGHT_SHIFT(long, a, b);
589 6077704dab7a Different shift implementation. Guido van Rossum <guido@python.org> parents: 471 diff changeset	730 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	731 return PyInt_FromLong(a);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	732 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	733
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	734 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	735 int_and(PyIntObject v, PyIntObject w)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	736 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	737 register long a, b;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	738 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	739 CONVERT_TO_LONG(w, b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	740 return PyInt_FromLong(a & b);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	741 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	742
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	743 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	744 int_xor(PyIntObject v, PyIntObject w)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	745 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	746 register long a, b;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	747 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	748 CONVERT_TO_LONG(w, b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	749 return PyInt_FromLong(a ^ b);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	750 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	751
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	752 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	753 int_or(PyIntObject v, PyIntObject w)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	754 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	755 register long a, b;
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	756 CONVERT_TO_LONG(v, a);
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	757 CONVERT_TO_LONG(w, b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	758 return PyInt_FromLong(a \| b);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	759 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 284 diff changeset	760
19976 da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	761 static int
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	762 int_coerce(PyObject pv, PyObject pw)
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	763 {
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	764 if (PyInt_Check(*pw)) {
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	765 Py_INCREF(*pv);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	766 Py_INCREF(*pw);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	767 return 0;
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	768 }
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	769 return 1; /* Can't do it */
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	770 }
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	771
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	772 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	773 int_int(PyIntObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	774 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	775 Py_INCREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	776 return (PyObject *)v;
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	777 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	778
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	779 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	780 int_long(PyIntObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	781 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	782 return PyLong_FromLong((v -> ob_ival));
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	783 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	784
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	785 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	786 int_float(PyIntObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	787 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	788 return PyFloat_FromDouble((double)(v -> ob_ival));
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	789 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	790
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	791 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	792 int_oct(PyIntObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	793 {
4952 05fd432d9e2b Increased buffer sizes used by hex() and oct() -- on 64-bit or 128-bit Guido van Rossum <guido@python.org> parents: 4937 diff changeset	794 char buf[100];
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	795 long x = v -> ob_ival;
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	796 if (x == 0)
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	797 strcpy(buf, "0");
4937 789de7c66712 Changed hex() and oct() again, to never emit a '-' sign. Guido van Rossum <guido@python.org> parents: 4926 diff changeset	798 else
21080 5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	799 PyOS_snprintf(buf, sizeof(buf), "0%lo", x);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	800 return PyString_FromString(buf);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	801 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	802
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	803 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	804 int_hex(PyIntObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	805 {
4952 05fd432d9e2b Increased buffer sizes used by hex() and oct() -- on 64-bit or 128-bit Guido van Rossum <guido@python.org> parents: 4937 diff changeset	806 char buf[100];
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	807 long x = v -> ob_ival;
21080 5b459677fc44 PyInt_FromString(), int_repr(), int_oct(), int_hex(): Conversion of Barry Warsaw <barry@python.org> parents: 19976 diff changeset	808 PyOS_snprintf(buf, sizeof(buf), "0x%lx", x);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	809 return PyString_FromString(buf);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	810 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 795 diff changeset	811
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	812 staticforward PyObject *
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	813 int_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	814
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	815 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	816 int_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	817 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	818 PyObject *x = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	819 int base = -909;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	820 static char *kwlist[] = {"x", "base", 0};
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	821
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	822 if (type != &PyInt_Type)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	823 return int_subtype_new(type, args, kwds); /* Wimp out */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	824 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|Oi:int", kwlist,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	825 &x, &base))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	826 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	827 if (x == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	828 return PyInt_FromLong(0L);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	829 if (base == -909)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	830 return PyNumber_Int(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	831 if (PyString_Check(x))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	832 return PyInt_FromString(PyString_AS_STRING(x), NULL, base);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	833 #ifdef Py_USING_UNICODE
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	834 if (PyUnicode_Check(x))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	835 return PyInt_FromUnicode(PyUnicode_AS_UNICODE(x),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	836 PyUnicode_GET_SIZE(x),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	837 base);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	838 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	839 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	840 "int() can't convert non-string with explicit base");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	841 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	842 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	843
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	844 /* Wimpy, slow approach to tp_new calls for subtypes of int:
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	845 first create a regular int from whatever arguments we got,
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	846 then allocate a subtype instance and initialize its ob_ival
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	847 from the regular int. The regular int is then thrown away.
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	848 */
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	849 static PyObject *
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	850 int_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	851 {
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	852 PyObject tmp, new;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	853
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	854 assert(PyType_IsSubtype(type, &PyInt_Type));
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	855 tmp = int_new(&PyInt_Type, args, kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	856 if (tmp == NULL)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	857 return NULL;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	858 assert(PyInt_Check(tmp));
19590 bf2c77840f1c Fix typo: double semicolons. Guido van Rossum <guido@python.org> parents: 19552 diff changeset	859 new = type->tp_alloc(type, 0);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	860 if (new == NULL)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	861 return NULL;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	862 ((PyIntObject )new)->ob_ival = ((PyIntObject )tmp)->ob_ival;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	863 Py_DECREF(tmp);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	864 return new;
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	865 }
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	866
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	867 static char int_doc[] =
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	868 "int(x[, base]) -> integer\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	869 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	870 Convert a string or number to an integer, if possible. A floating point\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	871 argument will be truncated towards zero (this does not include a string\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	872 representation of a floating point number!) When converting a string, use\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	873 the optional base. It is an error to supply a base when converting a\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	874 non-string.";
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	875
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	876 static PyNumberMethods int_as_number = {
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	877 (binaryfunc)int_add, /nb_add/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	878 (binaryfunc)int_sub, /nb_subtract/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	879 (binaryfunc)int_mul, /nb_multiply/
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	880 (binaryfunc)int_classic_div, /nb_divide/
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	881 (binaryfunc)int_mod, /nb_remainder/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	882 (binaryfunc)int_divmod, /nb_divmod/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	883 (ternaryfunc)int_pow, /nb_power/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	884 (unaryfunc)int_neg, /nb_negative/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	885 (unaryfunc)int_pos, /nb_positive/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	886 (unaryfunc)int_abs, /nb_absolute/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	887 (inquiry)int_nonzero, /nb_nonzero/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	888 (unaryfunc)int_invert, /nb_invert/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	889 (binaryfunc)int_lshift, /nb_lshift/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	890 (binaryfunc)int_rshift, /nb_rshift/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	891 (binaryfunc)int_and, /nb_and/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	892 (binaryfunc)int_xor, /nb_xor/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	893 (binaryfunc)int_or, /nb_or/
19976 da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	894 int_coerce, /nb_coerce/
15724 2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	895 (unaryfunc)int_int, /nb_int/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	896 (unaryfunc)int_long, /nb_long/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	897 (unaryfunc)int_float, /nb_float/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	898 (unaryfunc)int_oct, /nb_oct/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	899 (unaryfunc)int_hex, /nb_hex/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	900 0, /nb_inplace_add/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	901 0, /nb_inplace_subtract/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	902 0, /nb_inplace_multiply/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	903 0, /nb_inplace_divide/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	904 0, /nb_inplace_remainder/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	905 0, /nb_inplace_power/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	906 0, /nb_inplace_lshift/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	907 0, /nb_inplace_rshift/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	908 0, /nb_inplace_and/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	909 0, /nb_inplace_xor/
2dcc4a86a876 Make int a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	910 0, /nb_inplace_or/
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	911 (binaryfunc)int_div, /* nb_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	912 int_true_divide, /* nb_true_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	913 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	914 0, /* nb_inplace_true_divide */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	915 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	916
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	917 PyTypeObject PyInt_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	918 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	919 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	920 "int",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4952 diff changeset	921 sizeof(PyIntObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	922 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	923 (destructor)int_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	924 (printfunc)int_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	925 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	926 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	927 (cmpfunc)int_compare, /* tp_compare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	928 (reprfunc)int_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	929 &int_as_number, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	930 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	931 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	932 (hashfunc)int_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	933 0, /* tp_call */
21984 18b5c7f64c80 Backport gvanrossum's checkin of revision 2.80: Michael W. Hudson <mwh@python.net> parents: 21206 diff changeset	934 (reprfunc)int_repr, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	935 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	936 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	937 0, /* tp_as_buffer */
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	938 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_CHECKTYPES \|
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	939 Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	940 int_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	941 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	942 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	943 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	944 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	945 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	946 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	947 0, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	948 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	949 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	950 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	951 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	952 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	953 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	954 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	955 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	956 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18755 diff changeset	957 int_new, /* tp_new */
23283 3eddd9d68af7 backport gvanrossum's patch: Anthony Baxter <anthonybaxter@gmail.com> parents: 21984 diff changeset	958 (destructor)int_free, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	959 };
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	960
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	961 void
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13423 diff changeset	962 PyInt_Fini(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	963 {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	964 PyIntObject *p;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	965 PyIntBlock list, next;
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	966 int i;
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	967 int bc, bf; /* block count, number of freed blocks */
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	968 int irem, isum; /* remaining unfreed ints per block, total */
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	969
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	970 #if NSMALLNEGINTS + NSMALLPOSINTS > 0
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	971 PyIntObject **q;
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	972
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	973 i = NSMALLNEGINTS + NSMALLPOSINTS;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	974 q = small_ints;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	975 while (--i >= 0) {
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	976 Py_XDECREF(*q);
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	977 *q++ = NULL;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	978 }
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	979 #endif
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	980 bc = 0;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	981 bf = 0;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	982 isum = 0;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	983 list = block_list;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	984 block_list = NULL;
10431 0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	985 free_list = NULL;
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	986 while (list != NULL) {
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	987 bc++;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	988 irem = 0;
10431 0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	989 for (i = 0, p = &list->objects[0];
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	990 i < N_INTOBJECTS;
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	991 i++, p++) {
19865 f2a3009b528e Replace a few places where X->ob_type was compared to &PyXXX_Type with Guido van Rossum <guido@python.org> parents: 19719 diff changeset	992 if (PyInt_CheckExact(p) && p->ob_refcnt != 0)
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	993 irem++;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	994 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	995 next = list->next;
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	996 if (irem) {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	997 list->next = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	998 block_list = list;
10431 0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	999 for (i = 0, p = &list->objects[0];
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1000 i < N_INTOBJECTS;
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1001 i++, p++) {
19865 f2a3009b528e Replace a few places where X->ob_type was compared to &PyXXX_Type with Guido van Rossum <guido@python.org> parents: 19719 diff changeset	1002 if (!PyInt_CheckExact(p) \|\|
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19455 diff changeset	1003 p->ob_refcnt == 0) {
10431 0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1004 p->ob_type = (struct _typeobject *)
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1005 free_list;
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1006 free_list = p;
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1007 }
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1008 #if NSMALLNEGINTS + NSMALLPOSINTS > 0
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1009 else if (-NSMALLNEGINTS <= p->ob_ival &&
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1010 p->ob_ival < NSMALLPOSINTS &&
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1011 small_ints[p->ob_ival +
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1012 NSMALLNEGINTS] == NULL) {
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1013 Py_INCREF(p);
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1014 small_ints[p->ob_ival +
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1015 NSMALLNEGINTS] = p;
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1016 }
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1017 #endif
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1018 }
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1019 }
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1020 else {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	1021 PyMem_FREE(list); /* XXX PyObject_FREE ??? */
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1022 bf++;
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1023 }
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1024 isum += irem;
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1025 list = next;
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1026 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1027 if (!Py_VerboseFlag)
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1028 return;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1029 fprintf(stderr, "# cleanup ints");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1030 if (!isum) {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1031 fprintf(stderr, "\n");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1032 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1033 else {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1034 fprintf(stderr,
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1035 ": %d unfreed int%s in %d out of %d block%s\n",
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1036 isum, isum == 1 ? "" : "s",
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1037 bc - bf, bc, bc == 1 ? "" : "s");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1038 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1039 if (Py_VerboseFlag > 1) {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1040 list = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1041 while (list != NULL) {
10431 0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1042 for (i = 0, p = &list->objects[0];
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1043 i < N_INTOBJECTS;
0789e0b55587 Fix a problem with Vladimir's PyInt_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1044 i++, p++) {
19865 f2a3009b528e Replace a few places where X->ob_type was compared to &PyXXX_Type with Guido van Rossum <guido@python.org> parents: 19719 diff changeset	1045 if (PyInt_CheckExact(p) && p->ob_refcnt != 0)
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1046 fprintf(stderr,
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12630 diff changeset	1047 "# <int at %p, refcnt=%d, val=%ld>\n",
ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12630 diff changeset	1048 p, p->ob_refcnt, p->ob_ival);
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1049 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10373 diff changeset	1050 list = list->next;
10373 07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1051 }
07ee795774d8 Patch by Vladimir Marangoz to allow freeing of the allocated blocks of Guido van Rossum <guido@python.org> parents: 5936 diff changeset	1052 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1053 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/intobject.c @ 25838:8540887bcec6 2.2