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

annotate Objects/floatobject.c @ 58765:2ba7677bfa95 legacy-trunk

testCopysign was defined twice in test_math; combine the definitions

author	Mark Dickinson <dickinsm@gmail.com>
date	Sat, 06 Feb 2010 23:11:25 +0000
parents	ac5fd8909998
children	31c7def9bf51

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 91 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Float object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	4 /* XXX There should be overflow checks here, but it's hard to check
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	5 for any kind of float exception without losing portability. */
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	6
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	7 #include "Python.h"
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	8 #include "structseq.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 60 diff changeset	10 #include <ctype.h>
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	11 #include <float.h>
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	13 #undef MAX
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	14 #undef MIN
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	15 #define MAX(x, y) ((x) < (y) ? (y) : (x))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	16 #define MIN(x, y) ((x) < (y) ? (x) : (y))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	17
44940 12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	18 #ifdef _OSF_SOURCE
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	19 /* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	20 extern int finite(double);
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	21 #endif
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	22
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	23 /* Special free list -- see comments for same code in intobject.c. */
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	24 #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: 10382 diff changeset	25 #define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	26 #define N_FLOATOBJECTS ((BLOCK_SIZE - BHEAD_SIZE) / sizeof(PyFloatObject))
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	27
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	28 struct _floatblock {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	29 struct _floatblock *next;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	30 PyFloatObject objects[N_FLOATOBJECTS];
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	31 };
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	32
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	33 typedef struct _floatblock PyFloatBlock;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	34
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	35 static PyFloatBlock *block_list = NULL;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	36 static PyFloatObject *free_list = NULL;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	37
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	38 static PyFloatObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	39 fill_free_list(void)
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	40 {
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	41 PyFloatObject p, q;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	42 /* XXX Float 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	43 p = (PyFloatObject *) PyMem_MALLOC(sizeof(PyFloatBlock));
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	44 if (p == NULL)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	45 return (PyFloatObject *) PyErr_NoMemory();
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	46 ((PyFloatBlock *)p)->next = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	47 block_list = (PyFloatBlock *)p;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	48 p = &((PyFloatBlock *)p)->objects[0];
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	49 q = p + N_FLOATOBJECTS;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	50 while (--q > p)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	51 Py_TYPE(q) = (struct _typeobject *)(q-1);
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	52 Py_TYPE(q) = NULL;
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	53 return p + N_FLOATOBJECTS - 1;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	54 }
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	55
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	56 double
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	57 PyFloat_GetMax(void)
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	58 {
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	59 return DBL_MAX;
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	60 }
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	61
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	62 double
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	63 PyFloat_GetMin(void)
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	64 {
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	65 return DBL_MIN;
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	66 }
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	67
45060 c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	68 static PyTypeObject FloatInfoType = {0, 0, 0, 0, 0, 0};
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	69
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	70 PyDoc_STRVAR(floatinfo__doc__,
54777 4c6cdba1b0bb add underscores Benjamin Peterson <benjamin@python.org> parents: 54000 diff changeset	71 "sys.float_info\n\
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	72 \n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	73 A structseq holding information about the float type. It contains low level\n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	74 information about the precision and internal representation. Please study\n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	75 your system's :file:`float.h` for more information.");
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	76
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	77 static PyStructSequence_Field floatinfo_fields[] = {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	78 {"max", "DBL_MAX -- maximum representable finite float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	79 {"max_exp", "DBL_MAX_EXP -- maximum int e such that radix**(e-1) "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	80 "is representable"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	81 {"max_10_exp", "DBL_MAX_10_EXP -- maximum int e such that 10**e "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	82 "is representable"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	83 {"min", "DBL_MIN -- Minimum positive normalizer float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	84 {"min_exp", "DBL_MIN_EXP -- minimum int e such that radix**(e-1) "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	85 "is a normalized float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	86 {"min_10_exp", "DBL_MIN_10_EXP -- minimum int e such that 10**e is "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	87 "a normalized"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	88 {"dig", "DBL_DIG -- digits"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	89 {"mant_dig", "DBL_MANT_DIG -- mantissa digits"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	90 {"epsilon", "DBL_EPSILON -- Difference between 1 and the next "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	91 "representable float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	92 {"radix", "FLT_RADIX -- radix of exponent"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	93 {"rounds", "FLT_ROUNDS -- addition rounds"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	94 {0}
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	95 };
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	96
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	97 static PyStructSequence_Desc floatinfo_desc = {
54777 4c6cdba1b0bb add underscores Benjamin Peterson <benjamin@python.org> parents: 54000 diff changeset	98 "sys.float_info", /* name */
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	99 floatinfo__doc__, /* doc */
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	100 floatinfo_fields, /* fields */
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	101 11
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	102 };
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	103
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	104 PyObject *
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	105 PyFloat_GetInfo(void)
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	106 {
45060 c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	107 PyObject* floatinfo;
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	108 int pos = 0;
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	109
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	110 floatinfo = PyStructSequence_New(&FloatInfoType);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	111 if (floatinfo == NULL) {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	112 return NULL;
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	113 }
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	114
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	115 #define SetIntFlag(flag) \
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	116 PyStructSequence_SET_ITEM(floatinfo, pos++, PyInt_FromLong(flag))
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	117 #define SetDblFlag(flag) \
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	118 PyStructSequence_SET_ITEM(floatinfo, pos++, PyFloat_FromDouble(flag))
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	119
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	120 SetDblFlag(DBL_MAX);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	121 SetIntFlag(DBL_MAX_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	122 SetIntFlag(DBL_MAX_10_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	123 SetDblFlag(DBL_MIN);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	124 SetIntFlag(DBL_MIN_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	125 SetIntFlag(DBL_MIN_10_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	126 SetIntFlag(DBL_DIG);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	127 SetIntFlag(DBL_MANT_DIG);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	128 SetDblFlag(DBL_EPSILON);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	129 SetIntFlag(FLT_RADIX);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	130 SetIntFlag(FLT_ROUNDS);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	131 #undef SetIntFlag
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	132 #undef SetDblFlag
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	133
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	134 if (PyErr_Occurred()) {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	135 Py_CLEAR(floatinfo);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	136 return NULL;
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	137 }
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	138 return floatinfo;
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	139 }
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	140
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	141 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	142 PyFloat_FromDouble(double fval)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	143 {
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	144 register PyFloatObject *op;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	145 if (free_list == NULL) {
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	146 if ((free_list = fill_free_list()) == NULL)
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	147 return NULL;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	148 }
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24280 diff changeset	149 /* Inline PyObject_New */
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	150 op = free_list;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	151 free_list = (PyFloatObject *)Py_TYPE(op);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	152 PyObject_INIT(op, &PyFloat_Type);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	153 op->ob_fval = fval;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	154 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	155 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	156
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	157 /**************************************************************************
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	158 RED_FLAG 22-Sep-2000 tim
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	159 PyFloat_FromString's pend argument is braindead. Prior to this RED_FLAG,
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	160
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	161 1. If v was a regular string, *pend was set to point to its terminating
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	162 null byte. That's useless (the caller can find that without any
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	163 help from this function!).
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	164
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	165 2. If v was a Unicode string, or an object convertible to a character
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	166 buffer, *pend was set to point into stack trash (the auto temp
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	167 vector holding the character buffer). That was downright dangerous.
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	168
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	169 Since we can't change the interface of a public API function, pend is
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	170 still supported but now officially useless: if pend is not NULL,
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	171 *pend is set to NULL.
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	172 **************************************************************************/
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	173 PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	174 PyFloat_FromString(PyObject v, char *pend)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	175 {
53470 01c3363a357f Backport r71967 changes from py3k to trunk. Mark Dickinson <dickinsm@gmail.com> parents: 53442 diff changeset	176 const char s, last, *end;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	177 double x;
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	178 char buffer[256]; /* for errors */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	179 #ifdef Py_USING_UNICODE
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	180 char *s_buffer = NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	181 #endif
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36235 diff changeset	182 Py_ssize_t len;
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	183 PyObject *result = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	184
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	185 if (pend)
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	186 *pend = NULL;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	187 if (PyString_Check(v)) {
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	188 s = PyString_AS_STRING(v);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	189 len = PyString_GET_SIZE(v);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	190 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	191 #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	192 else if (PyUnicode_Check(v)) {
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	193 s_buffer = (char *)PyMem_MALLOC(PyUnicode_GET_SIZE(v)+1);
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	194 if (s_buffer == NULL)
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	195 return PyErr_NoMemory();
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	196 if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v),
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	197 PyUnicode_GET_SIZE(v),
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	198 s_buffer,
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	199 NULL))
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	200 goto error;
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	201 s = s_buffer;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36235 diff changeset	202 len = strlen(s);
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	203 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	204 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	205 else if (PyObject_AsCharBuffer(v, &s, &len)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	206 PyErr_SetString(PyExc_TypeError,
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	207 "float() argument must be a string or a number");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	208 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	209 }
53470 01c3363a357f Backport r71967 changes from py3k to trunk. Mark Dickinson <dickinsm@gmail.com> parents: 53442 diff changeset	210 last = s + len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	211
53712 1f00bc1d115a Eliminate some locale-dependent calls to isspace and tolower. Mark Dickinson <dickinsm@gmail.com> parents: 53618 diff changeset	212 while (Py_ISSPACE(*s))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	213 s++;
53470 01c3363a357f Backport r71967 changes from py3k to trunk. Mark Dickinson <dickinsm@gmail.com> parents: 53442 diff changeset	214 /* We don't care about overflow or underflow. If the platform
01c3363a357f Backport r71967 changes from py3k to trunk. Mark Dickinson <dickinsm@gmail.com> parents: 53442 diff changeset	215 * supports them, infinities and signed zeroes (on underflow) are
01c3363a357f Backport r71967 changes from py3k to trunk. Mark Dickinson <dickinsm@gmail.com> parents: 53442 diff changeset	216 * fine. */
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	217 x = PyOS_string_to_double(s, (char **)&end, NULL);
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	218 if (x == -1.0 && PyErr_Occurred())
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	219 goto error;
53712 1f00bc1d115a Eliminate some locale-dependent calls to isspace and tolower. Mark Dickinson <dickinsm@gmail.com> parents: 53618 diff changeset	220 while (Py_ISSPACE(*end))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	221 end++;
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	222 if (end == last)
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	223 result = PyFloat_FromDouble(x);
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	224 else {
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	225 PyOS_snprintf(buffer, sizeof(buffer),
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	226 "invalid literal for float(): %.200s", s);
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	227 PyErr_SetString(PyExc_ValueError, buffer);
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	228 result = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	229 }
56766 c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	230
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	231 error:
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	232 #ifdef Py_USING_UNICODE
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	233 if (s_buffer)
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	234 PyMem_FREE(s_buffer);
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	235 #endif
c56419cbdd48 Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in Mark Dickinson <dickinsm@gmail.com> parents: 56753 diff changeset	236 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	237 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	238
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	239 static void
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	240 float_dealloc(PyFloatObject *op)
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	241 {
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	242 if (PyFloat_CheckExact(op)) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	243 Py_TYPE(op) = (struct _typeobject *)free_list;
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	244 free_list = op;
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	245 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	246 else
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	247 Py_TYPE(op)->tp_free((PyObject *)op);
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	248 }
c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	249
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	250 double
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	251 PyFloat_AsDouble(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	252 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	253 PyNumberMethods *nb;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	254 PyFloatObject *fo;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	255 double val;
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	256
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	257 if (op && PyFloat_Check(op))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	258 return PyFloat_AS_DOUBLE((PyFloatObject*) op);
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	259
26272 fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	260 if (op == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	261 PyErr_BadArgument();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	262 return -1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	263 }
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	264
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	265 if ((nb = Py_TYPE(op)->tp_as_number) == NULL \|\| nb->nb_float == NULL) {
26272 fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	266 PyErr_SetString(PyExc_TypeError, "a float is required");
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	267 return -1;
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	268 }
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	269
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	270 fo = (PyFloatObject) (nb->nb_float) (op);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	271 if (fo == NULL)
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	272 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	273 if (!PyFloat_Check(fo)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	274 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	275 "nb_float should return float object");
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	276 return -1;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	277 }
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	278
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	279 val = PyFloat_AS_DOUBLE(fo);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	280 Py_DECREF(fo);
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	281
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	282 return val;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	283 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	284
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	285 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	286
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	287 /* Macro and helper that convert PyObject obj to a C double and store
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	288 the value in dbl; this replaces the functionality of the coercion
21354 fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	289 slot function. If conversion to double raises an exception, obj is
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	290 set to NULL, and the function invoking this macro returns NULL. If
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	291 obj is not of float, int or long type, Py_NotImplemented is incref'ed,
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	292 stored in obj, and returned from the function invoking this macro.
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	293 */
47822 3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	294 #define CONVERT_TO_DOUBLE(obj, dbl) \
3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	295 if (PyFloat_Check(obj)) \
3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	296 dbl = PyFloat_AS_DOUBLE(obj); \
3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	297 else if (convert_to_double(&(obj), &(dbl)) < 0) \
3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	298 return obj;
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	299
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	300 static int
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	301 convert_to_double(PyObject *v, double dbl)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	302 {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	303 register PyObject obj = v;
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	304
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	305 if (PyInt_Check(obj)) {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	306 *dbl = (double)PyInt_AS_LONG(obj);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	307 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	308 else if (PyLong_Check(obj)) {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	309 *dbl = PyLong_AsDouble(obj);
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	310 if (*dbl == -1.0 && PyErr_Occurred()) {
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	311 *v = NULL;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	312 return -1;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	313 }
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	314 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	315 else {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	316 Py_INCREF(Py_NotImplemented);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	317 *v = Py_NotImplemented;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	318 return -1;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	319 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	320 return 0;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	321 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	322
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	323 /* XXX PyFloat_AsString and PyFloat_AsReprString are deprecated:
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	324 XXX they pass a char buffer without passing a length.
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	325 */
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	326 void
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	327 PyFloat_AsString(char buf, PyFloatObject v)
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	328 {
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	329 char *tmp = PyOS_double_to_string(v->ob_fval, 'g',
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	330 PyFloat_STR_PRECISION,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	331 Py_DTSF_ADD_DOT_0, NULL);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	332 strcpy(buf, tmp);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	333 PyMem_Free(tmp);
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	334 }
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	335
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	336 void
fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	337 PyFloat_AsReprString(char buf, PyFloatObject v)
fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	338 {
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	339 char * tmp = PyOS_double_to_string(v->ob_fval, 'r', 0,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	340 Py_DTSF_ADD_DOT_0, NULL);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	341 strcpy(buf, tmp);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	342 PyMem_Free(tmp);
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	343 }
fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	344
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	345 /* ARGSUSED */
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 268 diff changeset	346 static int
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	347 float_print(PyFloatObject v, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	348 {
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	349 char *buf;
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	350 if (flags & Py_PRINT_RAW)
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	351 buf = PyOS_double_to_string(v->ob_fval,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	352 'g', PyFloat_STR_PRECISION,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	353 Py_DTSF_ADD_DOT_0, NULL);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	354 else
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	355 buf = PyOS_double_to_string(v->ob_fval,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	356 'r', 0, Py_DTSF_ADD_DOT_0, NULL);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42333 diff changeset	357 Py_BEGIN_ALLOW_THREADS
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	358 fputs(buf, fp);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42333 diff changeset	359 Py_END_ALLOW_THREADS
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	360 PyMem_Free(buf);
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 268 diff changeset	361 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	362 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	363
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	364 static PyObject *
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	365 float_str_or_repr(PyFloatObject *v, int precision, char format_code)
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	366 {
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	367 PyObject *result;
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	368 char *buf = PyOS_double_to_string(PyFloat_AS_DOUBLE(v),
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	369 format_code, precision,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	370 Py_DTSF_ADD_DOT_0,
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	371 NULL);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	372 if (!buf)
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	373 return PyErr_NoMemory();
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	374 result = PyString_FromString(buf);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	375 PyMem_Free(buf);
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	376 return result;
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	377 }
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	378
095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	379 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	380 float_repr(PyFloatObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	381 {
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	382 return float_str_or_repr(v, 0, 'r');
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	383 }
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	384
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	385 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	386 float_str(PyFloatObject *v)
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	387 {
56753 095af99e6b64 Start to remove _PyOS_double_to_string, as mentioned in issue 7117. Eric Smith <eric@trueblade.com> parents: 56723 diff changeset	388 return float_str_or_repr(v, PyFloat_STR_PRECISION, 'g');
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	389 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	390
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	391 /* Comparison is pretty much a nightmare. When comparing float to float,
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	392 * we do it as straightforwardly (and long-windedly) as conceivable, so
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	393 * that, e.g., Python x == y delivers the same result as the platform
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	394 * C x == y when x and/or y is a NaN.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	395 * When mixing float with an integer type, there's no good uniform approach.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	396 * Converting the double to an integer obviously doesn't work, since we
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	397 * may lose info from fractional bits. Converting the integer to a double
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	398 * also has two failure modes: (1) a long int may trigger overflow (too
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	399 * large to fit in the dynamic range of a C double); (2) even a C long may have
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	400 * more bits than fit in a C double (e.g., on a a 64-bit box long may have
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	401 * 63 bits of precision, but a C double probably has only 53), and then
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	402 * we can falsely claim equality when low-order integer bits are lost by
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	403 * coercion to double. So this part is painful too.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	404 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	405
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	406 static PyObject*
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	407 float_richcompare(PyObject v, PyObject w, int op)
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	408 {
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	409 double i, j;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	410 int r = 0;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	411
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	412 assert(PyFloat_Check(v));
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	413 i = PyFloat_AS_DOUBLE(v);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	414
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	415 /* Switch on the type of w. Set i and j to doubles to be compared,
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	416 * and op to the richcomp to use.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	417 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	418 if (PyFloat_Check(w))
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	419 j = PyFloat_AS_DOUBLE(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	420
38293 688f25757104 Added a new macro, Py_IS_FINITE(X). On windows there is an intrinsic for this and it is more efficient than to use !Py_IS_INFINITE(X) && !Py_IS_NAN(X). No change on other platforms Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 37815 diff changeset	421 else if (!Py_IS_FINITE(i)) {
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	422 if (PyInt_Check(w) \|\| PyLong_Check(w))
33549 ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	423 /* If i is an infinity, its magnitude exceeds any
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	424 * finite integer, so it doesn't matter which int we
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	425 * compare i with. If i is a NaN, similarly.
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	426 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	427 j = 0.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	428 else
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	429 goto Unimplemented;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	430 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	431
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	432 else if (PyInt_Check(w)) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	433 long jj = PyInt_AS_LONG(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	434 /* In the worst realistic case I can imagine, C double is a
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	435 * Cray single with 48 bits of precision, and long has 64
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	436 * bits.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	437 */
33549 ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	438 #if SIZEOF_LONG > 6
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	439 unsigned long abs = (unsigned long)(jj < 0 ? -jj : jj);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	440 if (abs >> 48) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	441 /* Needs more than 48 bits. Make it take the
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	442 * PyLong path.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	443 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	444 PyObject *result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	445 PyObject *ww = PyLong_FromLong(jj);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	446
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	447 if (ww == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	448 return NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	449 result = float_richcompare(v, ww, op);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	450 Py_DECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	451 return result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	452 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	453 #endif
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	454 j = (double)jj;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	455 assert((long)j == jj);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	456 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	457
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	458 else if (PyLong_Check(w)) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	459 int vsign = i == 0.0 ? 0 : i < 0.0 ? -1 : 1;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	460 int wsign = _PyLong_Sign(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	461 size_t nbits;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	462 int exponent;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	463
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	464 if (vsign != wsign) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	465 /* Magnitudes are irrelevant -- the signs alone
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	466 * determine the outcome.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	467 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	468 i = (double)vsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	469 j = (double)wsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	470 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	471 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	472 /* The signs are the same. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	473 /* Convert w to a double if it fits. In particular, 0 fits. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	474 nbits = _PyLong_NumBits(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	475 if (nbits == (size_t)-1 && PyErr_Occurred()) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	476 /* This long is so large that size_t isn't big enough
33549 ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	477 * to hold the # of bits. Replace with little doubles
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	478 * that give the same outcome -- w is so large that
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	479 * its magnitude must exceed the magnitude of any
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	480 * finite float.
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	481 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	482 PyErr_Clear();
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	483 i = (double)vsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	484 assert(wsign != 0);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	485 j = wsign * 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	486 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	487 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	488 if (nbits <= 48) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	489 j = PyLong_AsDouble(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	490 /* It's impossible that <= 48 bits overflowed. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	491 assert(j != -1.0 \|\| ! PyErr_Occurred());
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	492 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	493 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	494 assert(wsign != 0); /* else nbits was 0 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	495 assert(vsign != 0); /* if vsign were 0, then since wsign is
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	496 * not 0, we would have taken the
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	497 * vsign != wsign branch at the start */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	498 /* We want to work with non-negative numbers. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	499 if (vsign < 0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	500 /* "Multiply both sides" by -1; this also swaps the
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	501 * comparator.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	502 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	503 i = -i;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	504 op = _Py_SwappedOp[op];
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	505 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	506 assert(i > 0.0);
36235 9f66bdd5a061 Fix icc warnings: remove unused variable Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	507 (void) frexp(i, &exponent);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	508 /* exponent is the # of bits in v before the radix point;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	509 * we know that nbits (the # of bits in w) > 48 at this point
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	510 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	511 if (exponent < 0 \|\| (size_t)exponent < nbits) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	512 i = 1.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	513 j = 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	514 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	515 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	516 if ((size_t)exponent > nbits) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	517 i = 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	518 j = 1.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	519 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	520 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	521 /* v and w have the same number of bits before the radix
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	522 * point. Construct two longs that have the same comparison
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	523 * outcome.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	524 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	525 {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	526 double fracpart;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	527 double intpart;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	528 PyObject *result = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	529 PyObject *one = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	530 PyObject *vv = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	531 PyObject *ww = w;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	532
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	533 if (wsign < 0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	534 ww = PyNumber_Negative(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	535 if (ww == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	536 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	537 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	538 else
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	539 Py_INCREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	540
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	541 fracpart = modf(i, &intpart);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	542 vv = PyLong_FromDouble(intpart);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	543 if (vv == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	544 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	545
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	546 if (fracpart != 0.0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	547 /* Shift left, and or a 1 bit into vv
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	548 * to represent the lost fraction.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	549 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	550 PyObject *temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	551
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	552 one = PyInt_FromLong(1);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	553 if (one == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	554 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	555
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	556 temp = PyNumber_Lshift(ww, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	557 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	558 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	559 Py_DECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	560 ww = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	561
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	562 temp = PyNumber_Lshift(vv, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	563 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	564 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	565 Py_DECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	566 vv = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	567
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	568 temp = PyNumber_Or(vv, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	569 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	570 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	571 Py_DECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	572 vv = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	573 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	574
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	575 r = PyObject_RichCompareBool(vv, ww, op);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	576 if (r < 0)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	577 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	578 result = PyBool_FromLong(r);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	579 Error:
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	580 Py_XDECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	581 Py_XDECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	582 Py_XDECREF(one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	583 return result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	584 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	585 } /* else if (PyLong_Check(w)) */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	586
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	587 else /* w isn't float, int, or long */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	588 goto Unimplemented;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	589
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	590 Compare:
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	591 PyFPE_START_PROTECT("richcompare", return NULL)
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	592 switch (op) {
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	593 case Py_EQ:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	594 r = i == j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	595 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	596 case Py_NE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	597 r = i != j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	598 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	599 case Py_LE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	600 r = i <= j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	601 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	602 case Py_GE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	603 r = i >= j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	604 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	605 case Py_LT:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	606 r = i < j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	607 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	608 case Py_GT:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	609 r = i > j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	610 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	611 }
31589 ca3c998afa55 Pass a variable that actually exists to PyFPE_END_PROTECT in Michael W. Hudson <mwh@python.net> parents: 31553 diff changeset	612 PyFPE_END_PROTECT(r)
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	613 return PyBool_FromLong(r);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	614
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	615 Unimplemented:
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	616 Py_INCREF(Py_NotImplemented);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	617 return Py_NotImplemented;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	618 }
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	619
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	620 static long
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	621 float_hash(PyFloatObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	622 {
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13944 diff changeset	623 return _Py_HashDouble(v->ob_fval);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	624 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	625
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	626 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	627 float_add(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	628 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	629 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	630 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	631 CONVERT_TO_DOUBLE(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	632 PyFPE_START_PROTECT("add", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	633 a = a + b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	634 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	635 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	636 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	637
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	638 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	639 float_sub(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	640 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	641 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	642 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	643 CONVERT_TO_DOUBLE(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	644 PyFPE_START_PROTECT("subtract", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	645 a = a - b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	646 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	647 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	648 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	649
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	650 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	651 float_mul(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	652 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	653 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	654 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	655 CONVERT_TO_DOUBLE(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	656 PyFPE_START_PROTECT("multiply", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	657 a = a * b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	658 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	659 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	660 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	661
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	662 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	663 float_div(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	664 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	665 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	666 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	667 CONVERT_TO_DOUBLE(w, b);
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	668 #ifdef Py_NAN
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	669 if (b == 0.0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	670 PyErr_SetString(PyExc_ZeroDivisionError,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	671 "float division");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	672 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	673 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	674 #endif
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	675 PyFPE_START_PROTECT("divide", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	676 a = a / b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	677 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	678 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	679 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	680
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	681 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	682 float_classic_div(PyObject v, PyObject w)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	683 {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	684 double a,b;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	685 CONVERT_TO_DOUBLE(v, a);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	686 CONVERT_TO_DOUBLE(w, b);
19673 b3271297b984 PEP 238 documented -Qwarn as warning only for classic int or long Guido van Rossum <guido@python.org> parents: 19666 diff changeset	687 if (Py_DivisionWarningFlag >= 2 &&
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	688 PyErr_Warn(PyExc_DeprecationWarning, "classic float division") < 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	689 return NULL;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	690 #ifdef Py_NAN
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	691 if (b == 0.0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	692 PyErr_SetString(PyExc_ZeroDivisionError,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	693 "float division");
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	694 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	695 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	696 #endif
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	697 PyFPE_START_PROTECT("divide", return 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	698 a = a / b;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	699 PyFPE_END_PROTECT(a)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	700 return PyFloat_FromDouble(a);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	701 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	702
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	703 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	704 float_rem(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	705 {
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	706 double vx, wx;
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	707 double mod;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	708 CONVERT_TO_DOUBLE(v, vx);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	709 CONVERT_TO_DOUBLE(w, wx);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	710 #ifdef Py_NAN
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	711 if (wx == 0.0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	712 PyErr_SetString(PyExc_ZeroDivisionError,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	713 "float modulo");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	714 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	715 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	716 #endif
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	717 PyFPE_START_PROTECT("modulo", return 0)
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	718 mod = fmod(vx, wx);
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	719 /* note: checking mod*wx < 0 is incorrect -- underflows to
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	720 0 if wx < sqrt(smallest nonzero double) */
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	721 if (mod && ((wx < 0) != (mod < 0))) {
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	722 mod += wx;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	723 }
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	724 PyFPE_END_PROTECT(mod)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	725 return PyFloat_FromDouble(mod);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	726 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	727
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	728 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	729 float_divmod(PyObject v, PyObject w)
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	730 {
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	731 double vx, wx;
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	732 double div, mod, floordiv;
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	733 CONVERT_TO_DOUBLE(v, vx);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	734 CONVERT_TO_DOUBLE(w, wx);
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	735 if (wx == 0.0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	736 PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()");
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	737 return NULL;
caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	738 }
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	739 PyFPE_START_PROTECT("divmod", return 0)
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	740 mod = fmod(vx, wx);
14616 284508c653c7 Fixed legit gripe from c.l.py that math.fmod docs aren't confusing enough. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	741 /* fmod is typically exact, so vx-mod is mathematically an
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	742 exact multiple of wx. But this is fp arithmetic, and fp
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	743 vx - mod is an approximation; the result is that div may
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	744 not be an exact integral value after the division, although
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	745 it will always be very close to one.
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	746 */
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	747 div = (vx - mod) / wx;
20827 95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	748 if (mod) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	749 /* ensure the remainder has the same sign as the denominator */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	750 if ((wx < 0) != (mod < 0)) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	751 mod += wx;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	752 div -= 1.0;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	753 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	754 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	755 else {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	756 /* the remainder is zero, and in the presence of signed zeroes
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	757 fmod returns different results across platforms; ensure
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	758 it has the same sign as the denominator; we'd like to do
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	759 "mod = wx * 0.0", but that may get optimized away */
20829 14dc693af532 float_divmod(): the code wasn't sick enough to stop the MS optimizer Tim Peters <tim.peters@gmail.com> parents: 20827 diff changeset	760 mod = mod; / hide "mod = +0" from optimizer */
20827 95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	761 if (wx < 0.0)
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	762 mod = -mod;
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	763 }
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	764 /* snap quotient to nearest integral value */
20827 95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	765 if (div) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	766 floordiv = floor(div);
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	767 if (div - floordiv > 0.5)
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	768 floordiv += 1.0;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	769 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	770 else {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	771 /* div is zero - get the same sign as the true quotient */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	772 div = div; / hide "div = +0" from optimizers */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	773 floordiv = div * vx / wx; /* zero w/ sign of vx/wx */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	774 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	775 PyFPE_END_PROTECT(floordiv)
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	776 return Py_BuildValue("(dd)", floordiv, mod);
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	777 }
7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	778
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	779 static PyObject *
21353 257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	780 float_floor_div(PyObject v, PyObject w)
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	781 {
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	782 PyObject t, r;
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	783
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	784 t = float_divmod(v, w);
21354 fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	785 if (t == NULL \|\| t == Py_NotImplemented)
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	786 return t;
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	787 assert(PyTuple_CheckExact(t));
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	788 r = PyTuple_GET_ITEM(t, 0);
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	789 Py_INCREF(r);
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	790 Py_DECREF(t);
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	791 return r;
21353 257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	792 }
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	793
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	794 /* determine whether x is an odd integer or not; assumes that
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	795 x is not an infinity or nan. */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	796 #define DOUBLE_IS_ODD_INTEGER(x) (fmod(fabs(x), 2.0) == 1.0)
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	797
21353 257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	798 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	799 float_pow(PyObject v, PyObject w, PyObject *z)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	800 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	801 double iv, iw, ix;
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	802 int negate_result = 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	803
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	804 if ((PyObject *)z != Py_None) {
19719 cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	805 PyErr_SetString(PyExc_TypeError, "pow() 3rd argument not "
19753 c0580d8c193e Better error msg for 3-arg pow with a float argument. Tim Peters <tim.peters@gmail.com> parents: 19750 diff changeset	806 "allowed unless all arguments are integers");
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	807 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	808 }
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	809
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	810 CONVERT_TO_DOUBLE(v, iv);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	811 CONVERT_TO_DOUBLE(w, iw);
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	812
7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	813 /* Sort out special cases here instead of relying on pow() */
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	814 if (iw == 0) { /* v0 is 1, even 00 */
41580 a68467cc06d3 Remove dead code. This code couldn't be reached because earlier in Neal Norwitz <nnorwitz@gmail.com> parents: 39642 diff changeset	815 return PyFloat_FromDouble(1.0);
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	816 }
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	817 if (Py_IS_NAN(iv)) { /* nan*w = nan, unless w == 0 /
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	818 return PyFloat_FromDouble(iv);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	819 }
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	820 if (Py_IS_NAN(iw)) { /* vnan = nan, unless v == 1; 1nan = 1 */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	821 return PyFloat_FromDouble(iv == 1.0 ? 1.0 : iw);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	822 }
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	823 if (Py_IS_INFINITY(iw)) {
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	824 /* v**inf is: 0.0 if abs(v) < 1; 1.0 if abs(v) == 1; inf if
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	825 * abs(v) > 1 (including case where v infinite)
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	826 *
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	827 * v**-inf is: inf if abs(v) < 1; 1.0 if abs(v) == 1; 0.0 if
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	828 * abs(v) > 1 (including case where v infinite)
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	829 */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	830 iv = fabs(iv);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	831 if (iv == 1.0)
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	832 return PyFloat_FromDouble(1.0);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	833 else if ((iw > 0.0) == (iv > 1.0))
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	834 return PyFloat_FromDouble(fabs(iw)); /* return inf */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	835 else
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	836 return PyFloat_FromDouble(0.0);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	837 }
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	838 if (Py_IS_INFINITY(iv)) {
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	839 /* (+-inf)**w is: inf for w positive, 0 for w negative; in
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	840 * both cases, we need to add the appropriate sign if w is
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	841 * an odd integer.
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	842 */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	843 int iw_is_odd = DOUBLE_IS_ODD_INTEGER(iw);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	844 if (iw > 0.0)
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	845 return PyFloat_FromDouble(iw_is_odd ? iv : fabs(iv));
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	846 else
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	847 return PyFloat_FromDouble(iw_is_odd ?
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	848 copysign(0.0, iv) : 0.0);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	849 }
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	850 if (iv == 0.0) { /* 0**w is: 0 for w positive, 1 for w zero
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	851 (already dealt with above), and an error
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	852 if w is negative. */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	853 int iw_is_odd = DOUBLE_IS_ODD_INTEGER(iw);
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	854 if (iw < 0.0) {
7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	855 PyErr_SetString(PyExc_ZeroDivisionError,
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	856 "0.0 cannot be raised to a "
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	857 "negative power");
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	858 return NULL;
7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	859 }
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	860 /* use correct sign if iw is odd */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	861 return PyFloat_FromDouble(iw_is_odd ? iv : 0.0);
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	862 }
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	863
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	864 if (iv < 0.0) {
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	865 /* Whether this is an error is a mess, and bumps into libm
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	866 * bugs so we have to figure it out ourselves.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	867 */
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	868 if (iw != floor(iw)) {
44488 94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44432 diff changeset	869 PyErr_SetString(PyExc_ValueError, "negative number "
94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44432 diff changeset	870 "cannot be raised to a fractional power");
94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44432 diff changeset	871 return NULL;
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	872 }
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	873 /* iw is an exact integer, albeit perhaps a very large
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	874 * one. Replace iv by its absolute value and remember
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	875 * to negate the pow result if iw is odd.
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	876 */
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	877 iv = -iv;
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	878 negate_result = DOUBLE_IS_ODD_INTEGER(iw);
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	879 }
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	880
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	881 if (iv == 1.0) { /* 1w is 1, even 1inf and 1*nan /
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	882 /* (-1) ** large_integer also ends up here. Here's an
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	883 * extract from the comments for the previous
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	884 * implementation explaining why this special case is
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	885 * necessary:
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	886 *
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	887 * -1 raised to an exact integer should never be exceptional.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	888 * Alas, some libms (chiefly glibc as of early 2003) return
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	889 * NaN and set EDOM on pow(-1, large_int) if the int doesn't
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	890 * happen to be representable in a C integer. That's a
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	891 * bug.
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	892 */
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	893 return PyFloat_FromDouble(negate_result ? -1.0 : 1.0);
3984 0613f17dcfd8 Correct wrong calculation of pow(0.0, 0.0, negative_number) Guido van Rossum <guido@python.org> parents: 3704 diff changeset	894 }
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	895
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	896 /* Now iv and iw are finite, iw is nonzero, and iv is
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	897 * positive and not equal to 1.0. We finally allow
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	898 * the platform pow to step in and do the rest.
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	899 */
19457 6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	900 errno = 0;
6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	901 PyFPE_START_PROTECT("pow", return NULL)
6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	902 ix = pow(iv, iw);
6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	903 PyFPE_END_PROTECT(ix)
22228 4b6eda7d0c8f backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21354 diff changeset	904 Py_ADJUST_ERANGE1(ix);
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	905 if (negate_result)
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	906 ix = -ix;
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	907
39642 981181d2a4fe Reverting the patch that tried to fix the issue whereby x*2 raises Alex Martelli <aleaxit@gmail.com>* parents: 39639 diff changeset	908 if (errno != 0) {
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	909 /* We don't expect any errno value other than ERANGE, but
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	910 * the range of libm bugs appears unbounded.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	911 */
39642 981181d2a4fe Reverting the patch that tried to fix the issue whereby x*2 raises Alex Martelli <aleaxit@gmail.com>* parents: 39639 diff changeset	912 PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
981181d2a4fe Reverting the patch that tried to fix the issue whereby x*2 raises Alex Martelli <aleaxit@gmail.com>* parents: 39639 diff changeset	913 PyExc_ValueError);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	914 return NULL;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	915 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	916 return PyFloat_FromDouble(ix);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	917 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	918
58001 ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	919 #undef DOUBLE_IS_ODD_INTEGER
ac5fd8909998 Issue #7534: Fix handling of nans, infinities, and negative zero in ** Mark Dickinson <dickinsm@gmail.com> parents: 57485 diff changeset	920
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	921 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	922 float_neg(PyFloatObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	923 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	924 return PyFloat_FromDouble(-v->ob_fval);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	925 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	926
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	927 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	928 float_abs(PyFloatObject *v)
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	929 {
20826 3751366c2f39 float_abs() again: Guido pointed out that this could screw up in the Tim Peters <tim.peters@gmail.com> parents: 20823 diff changeset	930 return PyFloat_FromDouble(fabs(v->ob_fval));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	931 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	932
239 fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	933 static int
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	934 float_nonzero(PyFloatObject *v)
239 fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	935 {
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	936 return v->ob_fval != 0.0;
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	937 }
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	938
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	939 static int
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	940 float_coerce(PyObject pv, PyObject pw)
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	941 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	942 if (PyInt_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	943 long x = PyInt_AsLong(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	944 *pw = PyFloat_FromDouble((double)x);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	945 Py_INCREF(*pv);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	946 return 0;
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	947 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	948 else if (PyLong_Check(*pw)) {
27484 5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	949 double x = PyLong_AsDouble(*pw);
5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	950 if (x == -1.0 && PyErr_Occurred())
5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	951 return -1;
5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	952 *pw = PyFloat_FromDouble(x);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	953 Py_INCREF(*pv);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	954 return 0;
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	955 }
19976 da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	956 else if (PyFloat_Check(*pw)) {
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	957 Py_INCREF(*pv);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	958 Py_INCREF(*pw);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	959 return 0;
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	960 }
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	961 return 1; /* Can't do it */
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	962 }
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	963
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	964 static PyObject *
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	965 float_is_integer(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	966 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	967 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	968 PyObject *o;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	969
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	970 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	971 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	972 if (!Py_IS_FINITE(x))
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	973 Py_RETURN_FALSE;
46792 8baeba13ae93 Issue #2801: fix bug in float.is_integer where ValueError Mark Dickinson <dickinsm@gmail.com> parents: 46473 diff changeset	974 errno = 0;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	975 PyFPE_START_PROTECT("is_integer", return NULL)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	976 o = (floor(x) == x) ? Py_True : Py_False;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	977 PyFPE_END_PROTECT(x)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	978 if (errno != 0) {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	979 PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	980 PyExc_ValueError);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	981 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	982 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	983 Py_INCREF(o);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	984 return o;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	985 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	986
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	987 #if 0
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	988 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	989 float_is_inf(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	990 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	991 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	992 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	993 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	994 return PyBool_FromLong((long)Py_IS_INFINITY(x));
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	995 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	996
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	997 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	998 float_is_nan(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	999 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1000 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1001 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1002 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1003 return PyBool_FromLong((long)Py_IS_NAN(x));
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1004 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1005
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1006 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1007 float_is_finite(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1008 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1009 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1010 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1011 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1012 return PyBool_FromLong((long)Py_IS_FINITE(x));
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1013 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1014 #endif
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1015
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1016 static PyObject *
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1017 float_trunc(PyObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1018 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1019 double x = PyFloat_AsDouble(v);
18838 a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	1020 double wholepart; /* integral portion of x, rounded toward 0 */
a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	1021
a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	1022 (void)modf(x, &wholepart);
26328 f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1023 /* Try to get out cheap if this fits in a Python int. The attempt
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1024 * to cast to long must be protected, as C doesn't define what
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1025 * happens if the double is too big to fit in a long. Some rare
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1026 * systems raise an exception then (RISCOS was mentioned as one,
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1027 * and someone using a non-default option on Sun also bumped into
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1028 * that). Note that checking for >= and <= LONG_{MIN,MAX} would
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1029 * still be vulnerable: if a long has more bits of precision than
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1030 * a double, casting MIN/MAX to double may yield an approximation,
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1031 * and if that's rounded up, then, e.g., wholepart=LONG_MAX+1 would
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1032 * yield true from the C expression wholepart<=LONG_MAX, despite
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1033 * that wholepart is actually greater than LONG_MAX.
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1034 */
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1035 if (LONG_MIN < wholepart && wholepart < LONG_MAX) {
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1036 const long aslong = (long)wholepart;
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1037 return PyInt_FromLong(aslong);
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20277 diff changeset	1038 }
26328 f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1039 return PyLong_FromDouble(wholepart);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1040 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1041
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1042 static PyObject *
49104 974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1043 float_long(PyObject *v)
974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1044 {
974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1045 double x = PyFloat_AsDouble(v);
974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1046 return PyLong_FromDouble(x);
974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1047 }
974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1048
57324 92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1049 /* _Py_double_round: rounds a finite nonzero double to the closest multiple of
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1050 10**-ndigits; here ndigits is within reasonable bounds (typically, -308 <=
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1051 ndigits <= 323). Returns a Python float, or sets a Python error and
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1052 returns NULL on failure (OverflowError and memory errors are possible). */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1053
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1054 #ifndef PY_NO_SHORT_FLOAT_REPR
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1055 /* version of _Py_double_round that uses the correctly-rounded string<->double
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1056 conversions from Python/dtoa.c */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1057
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1058 /* FIVE_POW_LIMIT is the largest k such that 5**k is exactly representable as
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1059 a double. Since we're using the code in Python/dtoa.c, it should be safe
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1060 to assume that C doubles are IEEE 754 binary64 format. To be on the safe
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1061 side, we check this. */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1062 #if DBL_MANT_DIG == 53
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1063 #define FIVE_POW_LIMIT 22
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1064 #else
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1065 #error "C doubles do not appear to be IEEE 754 binary64 format"
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1066 #endif
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1067
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1068 PyObject *
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1069 _Py_double_round(double x, int ndigits) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1070
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1071 double rounded, m;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1072 Py_ssize_t buflen, mybuflen=100;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1073 char buf, buf_end, shortbuf[100], *mybuf=shortbuf;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1074 int decpt, sign, val, halfway_case;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1075 PyObject *result = NULL;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1076
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1077 /* The basic idea is very simple: convert and round the double to a
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1078 decimal string using _Py_dg_dtoa, then convert that decimal string
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1079 back to a double with _Py_dg_strtod. There's one minor difficulty:
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1080 Python 2.x expects round to do round-half-away-from-zero, while
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1081 _Py_dg_dtoa does round-half-to-even. So we need some way to detect
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1082 and correct the halfway cases.
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1083
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1084 Detection: a halfway value has the form k * 0.5 * 10**-ndigits for
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1085 some odd integer k. Or in other words, a rational number x is
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1086 exactly halfway between two multiples of 10**-ndigits if its
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1087 2-valuation is exactly -ndigits-1 and its 5-valuation is at least
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1088 -ndigits. For ndigits >= 0 the latter condition is automatically
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1089 satisfied for a binary float x, since any such float has
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1090 nonnegative 5-valuation. For 0 > ndigits >= -22, x needs to be an
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1091 integral multiple of 5**-ndigits; we can check this using fmod.
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1092 For -22 > ndigits, there are no halfway cases: 5**23 takes 54 bits
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1093 to represent exactly, so any odd multiple of 0.5 * 10**n for n >=
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1094 23 takes at least 54 bits of precision to represent exactly.
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1095
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1096 Correction: a simple strategy for dealing with halfway cases is to
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1097 (for the halfway cases only) call _Py_dg_dtoa with an argument of
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1098 ndigits+1 instead of ndigits (thus doing an exact conversion to
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1099 decimal), round the resulting string manually, and then convert
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1100 back using _Py_dg_strtod.
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1101 */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1102
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1103 /* nans, infinities and zeros should have already been dealt
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1104 with by the caller (in this case, builtin_round) */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1105 assert(Py_IS_FINITE(x) && x != 0.0);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1106
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1107 /* find 2-valuation val of x */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1108 m = frexp(x, &val);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1109 while (m != floor(m)) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1110 m *= 2.0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1111 val--;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1112 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1113
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1114 /* determine whether this is a halfway case */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1115 if (val == -ndigits-1) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1116 if (ndigits >= 0)
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1117 halfway_case = 1;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1118 else if (ndigits >= -FIVE_POW_LIMIT) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1119 double five_pow = 1.0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1120 int i;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1121 for (i=0; i < -ndigits; i++)
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1122 five_pow *= 5.0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1123 halfway_case = fmod(x, five_pow) == 0.0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1124 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1125 else
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1126 halfway_case = 0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1127 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1128 else
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1129 halfway_case = 0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1130
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1131 /* round to a decimal string; use an extra place for halfway case */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1132 buf = _Py_dg_dtoa(x, 3, ndigits+halfway_case, &decpt, &sign, &buf_end);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1133 if (buf == NULL) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1134 PyErr_NoMemory();
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1135 return NULL;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1136 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1137 buflen = buf_end - buf;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1138
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1139 /* in halfway case, do the round-half-away-from-zero manually */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1140 if (halfway_case) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1141 int i, carry;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1142 /* sanity check: _Py_dg_dtoa should not have stripped
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1143 any zeros from the result: there should be exactly
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1144 ndigits+1 places following the decimal point, and
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1145 the last digit in the buffer should be a '5'.*/
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1146 assert(buflen - decpt == ndigits+1);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1147 assert(buf[buflen-1] == '5');
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1148
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1149 /* increment and shift right at the same time. */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1150 decpt += 1;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1151 carry = 1;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1152 for (i=buflen-1; i-- > 0;) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1153 carry += buf[i] - '0';
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1154 buf[i+1] = carry % 10 + '0';
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1155 carry /= 10;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1156 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1157 buf[0] = carry + '0';
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1158 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1159
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1160 /* Get new buffer if shortbuf is too small. Space needed <= buf_end -
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1161 buf + 8: (1 extra for '0', 1 for sign, 5 for exp, 1 for '\0'). */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1162 if (buflen + 8 > mybuflen) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1163 mybuflen = buflen+8;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1164 mybuf = (char *)PyMem_Malloc(mybuflen);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1165 if (mybuf == NULL) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1166 PyErr_NoMemory();
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1167 goto exit;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1168 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1169 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1170 /* copy buf to mybuf, adding exponent, sign and leading 0 */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1171 PyOS_snprintf(mybuf, mybuflen, "%s0%se%d", (sign ? "-" : ""),
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1172 buf, decpt - (int)buflen);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1173
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1174 /* and convert the resulting string back to a double */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1175 errno = 0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1176 rounded = _Py_dg_strtod(mybuf, NULL);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1177 if (errno == ERANGE && fabs(rounded) >= 1.)
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1178 PyErr_SetString(PyExc_OverflowError,
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1179 "rounded value too large to represent");
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1180 else
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1181 result = PyFloat_FromDouble(rounded);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1182
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1183 /* done computing value; now clean up */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1184 if (mybuf != shortbuf)
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1185 PyMem_Free(mybuf);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1186 exit:
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1187 _Py_dg_freedtoa(buf);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1188 return result;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1189 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1190
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1191 #undef FIVE_POW_LIMIT
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1192
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1193 #else /* PY_NO_SHORT_FLOAT_REPR */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1194
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1195 /* fallback version, to be used when correctly rounded binary<->decimal
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1196 conversions aren't available */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1197
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1198 PyObject *
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1199 _Py_double_round(double x, int ndigits) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1200 double pow1, pow2, y, z;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1201 if (ndigits >= 0) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1202 if (ndigits > 22) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1203 /* pow1 and pow2 are each safe from overflow, but
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1204 pow1pow2 ~= pow(10.0, ndigits) might overflow /
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1205 pow1 = pow(10.0, (double)(ndigits-22));
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1206 pow2 = 1e22;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1207 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1208 else {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1209 pow1 = pow(10.0, (double)ndigits);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1210 pow2 = 1.0;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1211 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1212 y = (xpow1)pow2;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1213 /* if y overflows, then rounded value is exactly x */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1214 if (!Py_IS_FINITE(y))
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1215 return PyFloat_FromDouble(x);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1216 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1217 else {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1218 pow1 = pow(10.0, (double)-ndigits);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1219 pow2 = 1.0; /* unused; silences a gcc compiler warning */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1220 y = x / pow1;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1221 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1222
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1223 z = round(y);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1224 if (fabs(y-z) == 0.5)
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1225 /* halfway between two integers; use round-away-from-zero */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1226 z = y + copysign(0.5, y);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1227
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1228 if (ndigits >= 0)
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1229 z = (z / pow2) / pow1;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1230 else
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1231 z *= pow1;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1232
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1233 /* if computation resulted in overflow, raise OverflowError */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1234 if (!Py_IS_FINITE(z)) {
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1235 PyErr_SetString(PyExc_OverflowError,
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1236 "overflow occurred during round");
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1237 return NULL;
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1238 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1239
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1240 return PyFloat_FromDouble(z);
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1241 }
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1242
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1243 #endif /* PY_NO_SHORT_FLOAT_REPR */
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 56766 diff changeset	1244
49104 974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	1245 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1246 float_float(PyObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1247 {
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1248 if (PyFloat_CheckExact(v))
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1249 Py_INCREF(v);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1250 else
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1251 v = PyFloat_FromDouble(((PyFloatObject *)v)->ob_fval);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1252 return v;
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1253 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1254
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1255 /* turn ASCII hex characters into integer values and vice versa */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1256
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1257 static char
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1258 char_from_hex(int x)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1259 {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1260 assert(0 <= x && x < 16);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1261 return "0123456789abcdef"[x];
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1262 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1263
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1264 static int
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1265 hex_from_char(char c) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1266 int x;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1267 switch(c) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1268 case '0':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1269 x = 0;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1270 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1271 case '1':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1272 x = 1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1273 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1274 case '2':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1275 x = 2;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1276 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1277 case '3':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1278 x = 3;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1279 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1280 case '4':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1281 x = 4;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1282 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1283 case '5':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1284 x = 5;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1285 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1286 case '6':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1287 x = 6;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1288 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1289 case '7':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1290 x = 7;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1291 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1292 case '8':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1293 x = 8;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1294 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1295 case '9':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1296 x = 9;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1297 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1298 case 'a':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1299 case 'A':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1300 x = 10;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1301 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1302 case 'b':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1303 case 'B':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1304 x = 11;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1305 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1306 case 'c':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1307 case 'C':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1308 x = 12;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1309 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1310 case 'd':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1311 case 'D':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1312 x = 13;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1313 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1314 case 'e':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1315 case 'E':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1316 x = 14;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1317 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1318 case 'f':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1319 case 'F':
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1320 x = 15;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1321 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1322 default:
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1323 x = -1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1324 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1325 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1326 return x;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1327 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1328
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1329 /* convert a float to a hexadecimal string */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1330
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1331 /* TOHEX_NBITS is DBL_MANT_DIG rounded up to the next integer
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1332 of the form 4k+1. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1333 #define TOHEX_NBITS DBL_MANT_DIG + 3 - (DBL_MANT_DIG+2)%4
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1334
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1335 static PyObject *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1336 float_hex(PyObject *v)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1337 {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1338 double x, m;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1339 int e, shift, i, si, esign;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1340 /* Space for 1+(TOHEX_NBITS-1)/4 digits, a decimal point, and the
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1341 trailing NUL byte. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1342 char s[(TOHEX_NBITS-1)/4+3];
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1343
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1344 CONVERT_TO_DOUBLE(v, x);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1345
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1346 if (Py_IS_NAN(x) \|\| Py_IS_INFINITY(x))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1347 return float_str((PyFloatObject *)v);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1348
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1349 if (x == 0.0) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1350 if(copysign(1.0, x) == -1.0)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1351 return PyString_FromString("-0x0.0p+0");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1352 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1353 return PyString_FromString("0x0.0p+0");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1354 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1355
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1356 m = frexp(fabs(x), &e);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1357 shift = 1 - MAX(DBL_MIN_EXP - e, 0);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1358 m = ldexp(m, shift);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1359 e -= shift;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1360
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1361 si = 0;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1362 s[si] = char_from_hex((int)m);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1363 si++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1364 m -= (int)m;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1365 s[si] = '.';
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1366 si++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1367 for (i=0; i < (TOHEX_NBITS-1)/4; i++) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1368 m *= 16.0;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1369 s[si] = char_from_hex((int)m);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1370 si++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1371 m -= (int)m;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1372 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1373 s[si] = '\0';
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1374
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1375 if (e < 0) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1376 esign = (int)'-';
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1377 e = -e;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1378 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1379 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1380 esign = (int)'+';
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1381
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1382 if (x < 0.0)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1383 return PyString_FromFormat("-0x%sp%c%d", s, esign, e);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1384 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1385 return PyString_FromFormat("0x%sp%c%d", s, esign, e);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1386 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1387
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1388 PyDoc_STRVAR(float_hex_doc,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1389 "float.hex() -> string\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1390 \n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1391 Return a hexadecimal representation of a floating-point number.\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1392 >>> (-0.1).hex()\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1393 '-0x1.999999999999ap-4'\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1394 >>> 3.14159.hex()\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1395 '0x1.921f9f01b866ep+1'");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1396
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1397 /* Case-insensitive locale-independent string match used for nan and inf
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1398 detection. t should be lower-case and null-terminated. Return a nonzero
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1399 result if the first strlen(t) characters of s match t and 0 otherwise. */
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1400
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1401 static int
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1402 case_insensitive_match(const char s, const char t)
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1403 {
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1404 while(t && Py_TOLOWER(s) == *t) {
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1405 s++;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1406 t++;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1407 }
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1408 return *t ? 0 : 1;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1409 }
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1410
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1411 /* Convert a hexadecimal string to a float. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1412
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1413 static PyObject *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1414 float_fromhex(PyObject cls, PyObject arg)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1415 {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1416 PyObject result_as_float, result;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1417 double x;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1418 long exp, top_exp, lsb, key_digit;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1419 char s, coeff_start, s_store, coeff_end, exp_start, s_end;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1420 int half_eps, digit, round_up, sign=1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1421 Py_ssize_t length, ndigits, fdigits, i;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1422
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1423 /*
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1424 * For the sake of simplicity and correctness, we impose an artificial
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1425 * limit on ndigits, the total number of hex digits in the coefficient
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1426 * The limit is chosen to ensure that, writing exp for the exponent,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1427 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1428 * (1) if exp > LONG_MAX/2 then the value of the hex string is
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1429 * guaranteed to overflow (provided it's nonzero)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1430 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1431 * (2) if exp < LONG_MIN/2 then the value of the hex string is
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1432 * guaranteed to underflow to 0.
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1433 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1434 * (3) if LONG_MIN/2 <= exp <= LONG_MAX/2 then there's no danger of
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1435 * overflow in the calculation of exp and top_exp below.
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1436 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1437 * More specifically, ndigits is assumed to satisfy the following
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1438 * inequalities:
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1439 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1440 * 4*ndigits <= DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1441 * 4*ndigits <= LONG_MAX/2 + 1 - DBL_MAX_EXP
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1442 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1443 * If either of these inequalities is not satisfied, a ValueError is
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1444 * raised. Otherwise, write x for the value of the hex string, and
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1445 * assume x is nonzero. Then
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1446 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1447 * 2*(exp-4ndigits) <= \|x\| < 2*(exp+4ndigits).
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1448 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1449 * Now if exp > LONG_MAX/2 then:
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1450 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1451 * exp - 4*ndigits >= LONG_MAX/2 + 1 - (LONG_MAX/2 + 1 - DBL_MAX_EXP)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1452 * = DBL_MAX_EXP
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1453 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1454 * so \|x\| >= 2**DBL_MAX_EXP, which is too large to be stored in C
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1455 * double, so overflows. If exp < LONG_MIN/2, then
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1456 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1457 * exp + 4*ndigits <= LONG_MIN/2 - 1 + (
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1458 * DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1459 * = DBL_MIN_EXP - DBL_MANT_DIG - 1
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1460 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1461 * and so \|x\| < 2**(DBL_MIN_EXP-DBL_MANT_DIG-1), hence underflows to 0
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1462 * when converted to a C double.
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1463 *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1464 * It's easy to show that if LONG_MIN/2 <= exp <= LONG_MAX/2 then both
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1465 * exp+4ndigits and exp-4ndigits are within the range of a long.
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1466 */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1467
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1468 if (PyString_AsStringAndSize(arg, &s, &length))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1469 return NULL;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1470 s_end = s + length;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1471
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1472 /********************
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1473 * Parse the string *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1474 ********************/
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1475
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1476 /* leading whitespace and optional sign */
53712 1f00bc1d115a Eliminate some locale-dependent calls to isspace and tolower. Mark Dickinson <dickinsm@gmail.com> parents: 53618 diff changeset	1477 while (Py_ISSPACE(*s))
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1478 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1479 if (*s == '-') {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1480 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1481 sign = -1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1482 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1483 else if (*s == '+')
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1484 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1485
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1486 /* infinities and nans */
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1487 if (s == 'i' \|\| s == 'I') {
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1488 if (!case_insensitive_match(s+1, "nf"))
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1489 goto parse_error;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1490 s += 3;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1491 x = Py_HUGE_VAL;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1492 if (case_insensitive_match(s, "inity"))
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1493 s += 5;
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1494 goto finished;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1495 }
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1496 if (s == 'n' \|\| s == 'N') {
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1497 if (!case_insensitive_match(s+1, "an"))
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1498 goto parse_error;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1499 s += 3;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1500 x = Py_NAN;
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1501 goto finished;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1502 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1503
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1504 /* [0x] */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1505 s_store = s;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1506 if (*s == '0') {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1507 s++;
53712 1f00bc1d115a Eliminate some locale-dependent calls to isspace and tolower. Mark Dickinson <dickinsm@gmail.com> parents: 53618 diff changeset	1508 if (s == 'x' \|\| s == 'X')
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1509 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1510 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1511 s = s_store;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1512 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1513
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1514 /* coefficient: <integer> [. <fraction>] */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1515 coeff_start = s;
48818 e39d44adb618 issue 3633: Solaris allows fullwidth Unicode digits in isxdigit, so Mark Dickinson <dickinsm@gmail.com> parents: 47966 diff changeset	1516 while (hex_from_char(*s) >= 0)
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1517 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1518 s_store = s;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1519 if (*s == '.') {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1520 s++;
48818 e39d44adb618 issue 3633: Solaris allows fullwidth Unicode digits in isxdigit, so Mark Dickinson <dickinsm@gmail.com> parents: 47966 diff changeset	1521 while (hex_from_char(*s) >= 0)
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1522 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1523 coeff_end = s-1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1524 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1525 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1526 coeff_end = s;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1527
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1528 /* ndigits = total # of hex digits; fdigits = # after point */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1529 ndigits = coeff_end - coeff_start;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1530 fdigits = coeff_end - s_store;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1531 if (ndigits == 0)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1532 goto parse_error;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1533 if (ndigits > MIN(DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1534 LONG_MAX/2 + 1 - DBL_MAX_EXP)/4)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1535 goto insane_length_error;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1536
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1537 /* [p <exponent>] */
53712 1f00bc1d115a Eliminate some locale-dependent calls to isspace and tolower. Mark Dickinson <dickinsm@gmail.com> parents: 53618 diff changeset	1538 if (s == 'p' \|\| s == 'P') {
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1539 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1540 exp_start = s;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1541 if (s == '-' \|\| s == '+')
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1542 s++;
48818 e39d44adb618 issue 3633: Solaris allows fullwidth Unicode digits in isxdigit, so Mark Dickinson <dickinsm@gmail.com> parents: 47966 diff changeset	1543 if (!('0' <= s && s <= '9'))
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1544 goto parse_error;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1545 s++;
48818 e39d44adb618 issue 3633: Solaris allows fullwidth Unicode digits in isxdigit, so Mark Dickinson <dickinsm@gmail.com> parents: 47966 diff changeset	1546 while ('0' <= s && s <= '9')
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1547 s++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1548 exp = strtol(exp_start, NULL, 10);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1549 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1550 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1551 exp = 0;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1552
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1553 /* for 0 <= j < ndigits, HEX_DIGIT(j) gives the jth most significant digit */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1554 #define HEX_DIGIT(j) hex_from_char(*((j) < fdigits ? \
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1555 coeff_end-(j) : \
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1556 coeff_end-1-(j)))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1557
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1558 /*******************************************
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1559 * Compute rounded value of the hex string *
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1560 *******************************************/
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1561
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1562 /* Discard leading zeros, and catch extreme overflow and underflow */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1563 while (ndigits > 0 && HEX_DIGIT(ndigits-1) == 0)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1564 ndigits--;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1565 if (ndigits == 0 \|\| exp < LONG_MIN/2) {
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1566 x = 0.0;
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1567 goto finished;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1568 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1569 if (exp > LONG_MAX/2)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1570 goto overflow_error;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1571
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1572 /* Adjust exponent for fractional part. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1573 exp = exp - 4*((long)fdigits);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1574
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1575 /* top_exp = 1 more than exponent of most sig. bit of coefficient */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1576 top_exp = exp + 4*((long)ndigits - 1);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1577 for (digit = HEX_DIGIT(ndigits-1); digit != 0; digit /= 2)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1578 top_exp++;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1579
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1580 /* catch almost all nonextreme cases of overflow and underflow here */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1581 if (top_exp < DBL_MIN_EXP - DBL_MANT_DIG) {
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1582 x = 0.0;
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1583 goto finished;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1584 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1585 if (top_exp > DBL_MAX_EXP)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1586 goto overflow_error;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1587
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1588 /* lsb = exponent of least significant bit of the rounded value.
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1589 This is top_exp - DBL_MANT_DIG unless result is subnormal. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1590 lsb = MAX(top_exp, (long)DBL_MIN_EXP) - DBL_MANT_DIG;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1591
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1592 x = 0.0;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1593 if (exp >= lsb) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1594 /* no rounding required */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1595 for (i = ndigits-1; i >= 0; i--)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1596 x = 16.0*x + HEX_DIGIT(i);
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1597 x = ldexp(x, (int)(exp));
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1598 goto finished;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1599 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1600 /* rounding required. key_digit is the index of the hex digit
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1601 containing the first bit to be rounded away. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1602 half_eps = 1 << (int)((lsb - exp - 1) % 4);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1603 key_digit = (lsb - exp - 1) / 4;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1604 for (i = ndigits-1; i > key_digit; i--)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1605 x = 16.0*x + HEX_DIGIT(i);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1606 digit = HEX_DIGIT(key_digit);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1607 x = 16.0x + (double)(digit & (16-2half_eps));
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1608
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1609 /* round-half-even: round up if bit lsb-1 is 1 and at least one of
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1610 bits lsb, lsb-2, lsb-3, lsb-4, ... is 1. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1611 if ((digit & half_eps) != 0) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1612 round_up = 0;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1613 if ((digit & (3*half_eps-1)) != 0 \|\|
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1614 (half_eps == 8 && (HEX_DIGIT(key_digit+1) & 1) != 0))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1615 round_up = 1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1616 else
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1617 for (i = key_digit-1; i >= 0; i--)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1618 if (HEX_DIGIT(i) != 0) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1619 round_up = 1;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1620 break;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1621 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1622 if (round_up == 1) {
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1623 x += 2*half_eps;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1624 if (top_exp == DBL_MAX_EXP &&
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1625 x == ldexp((double)(2*half_eps), DBL_MANT_DIG))
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1626 /* overflow corner case: pre-rounded value <
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1627 2DBL_MAX_EXP; rounded=2DBL_MAX_EXP. */
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1628 goto overflow_error;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1629 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1630 }
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1631 x = ldexp(x, (int)(exp+4*key_digit));
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1632
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1633 finished:
54000 119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1634 /* optional trailing whitespace leading to the end of the string */
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1635 while (Py_ISSPACE(*s))
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1636 s++;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1637 if (s != s_end)
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1638 goto parse_error;
119f4232af46 Issue #5981: Fix some float.fromhex bugs related to inf and nan handling. Mark Dickinson <dickinsm@gmail.com> parents: 53802 diff changeset	1639 result_as_float = Py_BuildValue("(d)", sign * x);
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1640 if (result_as_float == NULL)
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1641 return NULL;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1642 result = PyObject_CallObject(cls, result_as_float);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1643 Py_DECREF(result_as_float);
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1644 return result;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1645
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1646 overflow_error:
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1647 PyErr_SetString(PyExc_OverflowError,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1648 "hexadecimal value too large to represent as a float");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1649 return NULL;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1650
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1651 parse_error:
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1652 PyErr_SetString(PyExc_ValueError,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1653 "invalid hexadecimal floating-point string");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1654 return NULL;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1655
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1656 insane_length_error:
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1657 PyErr_SetString(PyExc_ValueError,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1658 "hexadecimal string too long to convert");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1659 return NULL;
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1660 }
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1661
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1662 PyDoc_STRVAR(float_fromhex_doc,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1663 "float.fromhex(string) -> float\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1664 \n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1665 Create a floating-point number from a hexadecimal string.\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1666 >>> float.fromhex('0x1.ffffp10')\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1667 2047.984375\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1668 >>> float.fromhex('-0x1p-1074')\n\
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1669 -4.9406564584124654e-324");
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1670
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1671
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1672 static PyObject *
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1673 float_as_integer_ratio(PyObject v, PyObject unused)
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1674 {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1675 double self;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1676 double float_part;
45099 d0b31f24694d Fix int/long typecase. Add check for non-binary floating point. Raymond Hettinger <python@rcn.com> parents: 45096 diff changeset	1677 int exponent;
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1678 int i;
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1679
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1680 PyObject *prev;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1681 PyObject *py_exponent = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1682 PyObject *numerator = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1683 PyObject *denominator = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1684 PyObject *result_pair = NULL;
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1685 PyNumberMethods *long_methods = PyLong_Type.tp_as_number;
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1686
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1687 #define INPLACE_UPDATE(obj, call) \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1688 prev = obj; \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1689 obj = call; \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1690 Py_DECREF(prev); \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1691
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1692 CONVERT_TO_DOUBLE(v, self);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1693
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1694 if (Py_IS_INFINITY(self)) {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1695 PyErr_SetString(PyExc_OverflowError,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1696 "Cannot pass infinity to float.as_integer_ratio.");
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1697 return NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1698 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1699 #ifdef Py_NAN
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1700 if (Py_IS_NAN(self)) {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1701 PyErr_SetString(PyExc_ValueError,
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49266 diff changeset	1702 "Cannot pass NaN to float.as_integer_ratio.");
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1703 return NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1704 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1705 #endif
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1706
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1707 PyFPE_START_PROTECT("as_integer_ratio", goto error);
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1708 float_part = frexp(self, &exponent); /* self == float_part * 2*exponent exactly /
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1709 PyFPE_END_PROTECT(float_part);
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1710
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1711 for (i=0; i<300 && float_part != floor(float_part) ; i++) {
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1712 float_part *= 2.0;
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1713 exponent--;
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1714 }
45101 f5e18c9bde70 Simpler solution to handling non-IEEE 754 environments. Raymond Hettinger <python@rcn.com> parents: 45100 diff changeset	1715 /* self == float_part * 2**exponent exactly and float_part is integral.
f5e18c9bde70 Simpler solution to handling non-IEEE 754 environments. Raymond Hettinger <python@rcn.com> parents: 45100 diff changeset	1716 If FLT_RADIX != 2, the 300 steps may leave a tiny fractional part
f5e18c9bde70 Simpler solution to handling non-IEEE 754 environments. Raymond Hettinger <python@rcn.com> parents: 45100 diff changeset	1717 to be truncated by PyLong_FromDouble(). */
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1718
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1719 numerator = PyLong_FromDouble(float_part);
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1720 if (numerator == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1721
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1722 /* fold in 2*exponent /
45095 5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1723 denominator = PyLong_FromLong(1);
45099 d0b31f24694d Fix int/long typecase. Add check for non-binary floating point. Raymond Hettinger <python@rcn.com> parents: 45096 diff changeset	1724 py_exponent = PyLong_FromLong(labs((long)exponent));
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1725 if (py_exponent == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1726 INPLACE_UPDATE(py_exponent,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1727 long_methods->nb_lshift(denominator, py_exponent));
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1728 if (py_exponent == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1729 if (exponent > 0) {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1730 INPLACE_UPDATE(numerator,
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1731 long_methods->nb_multiply(numerator, py_exponent));
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1732 if (numerator == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1733 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1734 else {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1735 Py_DECREF(denominator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1736 denominator = py_exponent;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1737 py_exponent = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1738 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1739
45095 5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1740 /* Returns ints instead of longs where possible */
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1741 INPLACE_UPDATE(numerator, PyNumber_Int(numerator));
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1742 if (numerator == NULL) goto error;
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1743 INPLACE_UPDATE(denominator, PyNumber_Int(denominator));
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1744 if (denominator == NULL) goto error;
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1745
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1746 result_pair = PyTuple_Pack(2, numerator, denominator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1747
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1748 #undef INPLACE_UPDATE
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1749 error:
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1750 Py_XDECREF(py_exponent);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1751 Py_XDECREF(denominator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1752 Py_XDECREF(numerator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1753 return result_pair;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1754 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1755
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1756 PyDoc_STRVAR(float_as_integer_ratio_doc,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1757 "float.as_integer_ratio() -> (int, int)\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1758 "\n"
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1759 "Returns a pair of integers, whose ratio is exactly equal to the original\n"
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1760 "float and with a positive denominator.\n"
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49266 diff changeset	1761 "Raises OverflowError on infinities and a ValueError on NaNs.\n"
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1762 "\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1763 ">>> (10.0).as_integer_ratio()\n"
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1764 "(10, 1)\n"
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1765 ">>> (0.0).as_integer_ratio()\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1766 "(0, 1)\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1767 ">>> (-.25).as_integer_ratio()\n"
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1768 "(-1, 4)");
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1769
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1770
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	1771 static PyObject *
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1772 float_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1773
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1774 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1775 float_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1776 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1777 PyObject x = Py_False; / Integer zero */
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1778 static char *kwlist[] = {"x", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1779
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1780 if (type != &PyFloat_Type)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1781 return float_subtype_new(type, args, kwds); /* Wimp out */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1782 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:float", kwlist, &x))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1783 return NULL;
53162 6bcdc131f53c Merged revisions 71627 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49431 diff changeset	1784 /* If it's a string, but not a string subclass, use
6bcdc131f53c Merged revisions 71627 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49431 diff changeset	1785 PyFloat_FromString. */
6bcdc131f53c Merged revisions 71627 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49431 diff changeset	1786 if (PyString_CheckExact(x))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1787 return PyFloat_FromString(x, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1788 return PyNumber_Float(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1789 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1790
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1791 /* Wimpy, slow approach to tp_new calls for subtypes of float:
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1792 first create a regular float from whatever arguments we got,
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1793 then allocate a subtype instance and initialize its ob_fval
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1794 from the regular float. The regular float is then thrown away.
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1795 */
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1796 static PyObject *
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1797 float_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1798 {
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1799 PyObject tmp, newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1800
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1801 assert(PyType_IsSubtype(type, &PyFloat_Type));
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1802 tmp = float_new(&PyFloat_Type, args, kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1803 if (tmp == NULL)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1804 return NULL;
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19879 diff changeset	1805 assert(PyFloat_CheckExact(tmp));
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1806 newobj = type->tp_alloc(type, 0);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1807 if (newobj == NULL) {
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29252 diff changeset	1808 Py_DECREF(tmp);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1809 return NULL;
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29252 diff changeset	1810 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1811 ((PyFloatObject )newobj)->ob_fval = ((PyFloatObject )tmp)->ob_fval;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1812 Py_DECREF(tmp);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1813 return newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1814 }
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1815
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1816 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1817 float_getnewargs(PyFloatObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1818 {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1819 return Py_BuildValue("(d)", v->ob_fval);
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1820 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1821
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1822 /* this is for the benefit of the pack/unpack routines below */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1823
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1824 typedef enum {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1825 unknown_format, ieee_big_endian_format, ieee_little_endian_format
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1826 } float_format_type;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1827
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1828 static float_format_type double_format, float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1829 static float_format_type detected_double_format, detected_float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1830
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1831 static PyObject *
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1832 float_getformat(PyTypeObject v, PyObject arg)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1833 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1834 char* s;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1835 float_format_type r;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1836
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1837 if (!PyString_Check(arg)) {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1838 PyErr_Format(PyExc_TypeError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1839 "__getformat__() argument must be string, not %.500s",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1840 Py_TYPE(arg)->tp_name);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1841 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1842 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1843 s = PyString_AS_STRING(arg);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1844 if (strcmp(s, "double") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1845 r = double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1846 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1847 else if (strcmp(s, "float") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1848 r = float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1849 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1850 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1851 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1852 "__getformat__() argument 1 must be "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1853 "'double' or 'float'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1854 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1855 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1856
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1857 switch (r) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1858 case unknown_format:
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1859 return PyString_FromString("unknown");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1860 case ieee_little_endian_format:
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1861 return PyString_FromString("IEEE, little-endian");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1862 case ieee_big_endian_format:
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1863 return PyString_FromString("IEEE, big-endian");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1864 default:
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1865 Py_FatalError("insane float_format or double_format");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1866 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1867 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1868 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1869
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1870 PyDoc_STRVAR(float_getformat_doc,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1871 "float.__getformat__(typestr) -> string\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1872 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1873 "You probably don't want to use this function. It exists mainly to be\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1874 "used in Python's test suite.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1875 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1876 "typestr must be 'double' or 'float'. This function returns whichever of\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1877 "'unknown', 'IEEE, big-endian' or 'IEEE, little-endian' best describes the\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1878 "format of floating point numbers used by the C type named by typestr.");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1879
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1880 static PyObject *
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1881 float_setformat(PyTypeObject v, PyObject args)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1882 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1883 char* typestr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1884 char* format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1885 float_format_type f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1886 float_format_type detected;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1887 float_format_type *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1888
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1889 if (!PyArg_ParseTuple(args, "ss:__setformat__", &typestr, &format))
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1890 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1891
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1892 if (strcmp(typestr, "double") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1893 p = &double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1894 detected = detected_double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1895 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1896 else if (strcmp(typestr, "float") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1897 p = &float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1898 detected = detected_float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1899 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1900 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1901 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1902 "__setformat__() argument 1 must "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1903 "be 'double' or 'float'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1904 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1905 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1906
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1907 if (strcmp(format, "unknown") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1908 f = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1909 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1910 else if (strcmp(format, "IEEE, little-endian") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1911 f = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1912 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1913 else if (strcmp(format, "IEEE, big-endian") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1914 f = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1915 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1916 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1917 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1918 "__setformat__() argument 2 must be "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1919 "'unknown', 'IEEE, little-endian' or "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1920 "'IEEE, big-endian'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1921 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1922
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1923 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1924
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1925 if (f != unknown_format && f != detected) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1926 PyErr_Format(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1927 "can only set %s format to 'unknown' or the "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1928 "detected platform value", typestr);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1929 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1930 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1931
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1932 *p = f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1933 Py_RETURN_NONE;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1934 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1935
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1936 PyDoc_STRVAR(float_setformat_doc,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1937 "float.__setformat__(typestr, fmt) -> None\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1938 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1939 "You probably don't want to use this function. It exists mainly to be\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1940 "used in Python's test suite.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1941 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1942 "typestr must be 'double' or 'float'. fmt must be one of 'unknown',\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1943 "'IEEE, big-endian' or 'IEEE, little-endian', and in addition can only be\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1944 "one of the latter two if it appears to match the underlying C reality.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1945 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1946 "Overrides the automatic determination of C-level floating point type.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1947 "This affects how floats are converted to and from binary strings.");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1948
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1949 static PyObject *
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1950 float_getzero(PyObject v, void closure)
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1951 {
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1952 return PyFloat_FromDouble(0.0);
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1953 }
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1954
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1955 static PyObject *
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1956 float__format__(PyObject self, PyObject args)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1957 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1958 PyObject *format_spec;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1959
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1960 if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1961 return NULL;
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46792 diff changeset	1962 if (PyBytes_Check(format_spec))
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1963 return _PyFloat_FormatAdvanced(self,
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1964 PyBytes_AS_STRING(format_spec),
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1965 PyBytes_GET_SIZE(format_spec));
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1966 if (PyUnicode_Check(format_spec)) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1967 /* Convert format_spec to a str */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1968 PyObject *result;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1969 PyObject *str_spec = PyObject_Str(format_spec);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1970
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1971 if (str_spec == NULL)
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1972 return NULL;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1973
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1974 result = _PyFloat_FormatAdvanced(self,
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1975 PyBytes_AS_STRING(str_spec),
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1976 PyBytes_GET_SIZE(str_spec));
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1977
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1978 Py_DECREF(str_spec);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1979 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1980 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1981 PyErr_SetString(PyExc_TypeError, "__format__ requires str or unicode");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1982 return NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1983 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1984
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1985 PyDoc_STRVAR(float__format__doc,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1986 "float.__format__(format_spec) -> string\n"
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1987 "\n"
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1988 "Formats the float according to format_spec.");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1989
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1990
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1991 static PyMethodDef float_methods[] = {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1992 {"conjugate", (PyCFunction)float_float, METH_NOARGS,
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1993 "Returns self, the complex conjugate of any float."},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1994 {"__trunc__", (PyCFunction)float_trunc, METH_NOARGS,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1995 "Returns the Integral closest to x between 0 and x."},
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1996 {"as_integer_ratio", (PyCFunction)float_as_integer_ratio, METH_NOARGS,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1997 float_as_integer_ratio_doc},
47966 97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1998 {"fromhex", (PyCFunction)float_fromhex,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	1999 METH_O\|METH_CLASS, float_fromhex_doc},
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	2000 {"hex", (PyCFunction)float_hex,
97ba936e8df8 Issue #3008: add instance method float.hex and class method float.fromhex Mark Dickinson <dickinsm@gmail.com> parents: 47897 diff changeset	2001 METH_NOARGS, float_hex_doc},
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2002 {"is_integer", (PyCFunction)float_is_integer, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2003 "Returns True if the float is an integer."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2004 #if 0
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2005 {"is_inf", (PyCFunction)float_is_inf, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2006 "Returns True if the float is positive or negative infinite."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2007 {"is_finite", (PyCFunction)float_is_finite, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2008 "Returns True if the float is finite, neither infinite nor NaN."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2009 {"is_nan", (PyCFunction)float_is_nan, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2010 "Returns True if the float is not a number (NaN)."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	2011 #endif
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	2012 {"__getnewargs__", (PyCFunction)float_getnewargs, METH_NOARGS},
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2013 {"__getformat__", (PyCFunction)float_getformat,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2014 METH_O\|METH_CLASS, float_getformat_doc},
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2015 {"__setformat__", (PyCFunction)float_setformat,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2016 METH_VARARGS\|METH_CLASS, float_setformat_doc},
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	2017 {"__format__", (PyCFunction)float__format__,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	2018 METH_VARARGS, float__format__doc},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	2019 {NULL, NULL} /* sentinel */
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	2020 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	2021
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2022 static PyGetSetDef float_getset[] = {
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2023 {"real",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2024 (getter)float_float, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2025 "the real part of a complex number",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2026 NULL},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2027 {"imag",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2028 (getter)float_getzero, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2029 "the imaginary part of a complex number",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2030 NULL},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2031 {NULL} /* Sentinel */
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2032 };
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2033
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23344 diff changeset	2034 PyDoc_STRVAR(float_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2035 "float(x) -> floating point number\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2036 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23344 diff changeset	2037 Convert a string or number to a floating point number, if possible.");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2038
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2039
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2040 static PyNumberMethods float_as_number = {
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2041 float_add, /nb_add/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2042 float_sub, /nb_subtract/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2043 float_mul, /nb_multiply/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2044 float_classic_div, /nb_divide/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2045 float_rem, /nb_remainder/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2046 float_divmod, /nb_divmod/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2047 float_pow, /nb_power/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	2048 (unaryfunc)float_neg, /nb_negative/
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2049 (unaryfunc)float_float, /nb_positive/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	2050 (unaryfunc)float_abs, /nb_absolute/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	2051 (inquiry)float_nonzero, /nb_nonzero/
405 d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	2052 0, /nb_invert/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	2053 0, /nb_lshift/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	2054 0, /nb_rshift/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	2055 0, /nb_and/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	2056 0, /nb_xor/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	2057 0, /nb_or/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2058 float_coerce, /nb_coerce/
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2059 float_trunc, /nb_int/
49104 974040c8f369 #3777: long(4.2) returned an int, and broke backward compatibility. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48818 diff changeset	2060 float_long, /nb_long/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2061 float_float, /nb_float/
47822 3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	2062 0, /* nb_oct */
3ada46f2321d Revert 64424, 64438, and 64439. Raymond Hettinger <python@rcn.com> parents: 47791 diff changeset	2063 0, /* nb_hex */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2064 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2065 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2066 0, /* nb_inplace_multiply */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2067 0, /* nb_inplace_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2068 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2069 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2070 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2071 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2072 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2073 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2074 0, /* nb_inplace_or */
21353 257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	2075 float_floor_div, /* nb_floor_divide */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2076 float_div, /* nb_true_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2077 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	2078 0, /* nb_inplace_true_divide */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2079 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2080
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2081 PyTypeObject PyFloat_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41580 diff changeset	2082 PyVarObject_HEAD_INIT(&PyType_Type, 0)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2083 "float",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2084 sizeof(PyFloatObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2085 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2086 (destructor)float_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2087 (printfunc)float_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2088 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2089 0, /* tp_setattr */
32150 65f9ad9bc829 Remove float_compare as per Michael W. Hudson <mwh@python.net> parents: 31590 diff changeset	2090 0, /* tp_compare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2091 (reprfunc)float_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2092 &float_as_number, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2093 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2094 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2095 (hashfunc)float_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2096 0, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2097 (reprfunc)float_str, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2098 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2099 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2100 0, /* tp_as_buffer */
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	2101 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_CHECKTYPES \|
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	2102 Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2103 float_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2104 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2105 0, /* tp_clear */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	2106 float_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2107 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2108 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2109 0, /* tp_iternext */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	2110 float_methods, /* tp_methods */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2111 0, /* tp_members */
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2112 float_getset, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2113 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2114 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2115 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2116 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2117 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2118 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2119 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	2120 float_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2121 };
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	2122
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	2123 void
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2124 _PyFloat_Init(void)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2125 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2126 /* We attempt to determine if this machine is using IEEE
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2127 floating point formats by peering at the bits of some
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2128 carefully chosen values. If it looks like we are on an
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2129 IEEE platform, the float packing/unpacking routines can
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2130 just copy bits, if not they resort to arithmetic & shifts
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2131 and masks. The shifts & masks approach works on all finite
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2132 values, but what happens to infinities, NaNs and signed
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2133 zeroes on packing is an accident, and attempting to unpack
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2134 a NaN or an infinity will raise an exception.
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2135
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2136 Note that if we're on some whacked-out platform which uses
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2137 IEEE formats but isn't strictly little-endian or big-
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2138 endian, we will fall back to the portable shifts & masks
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2139 method. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2140
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2141 #if SIZEOF_DOUBLE == 8
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2142 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2143 double x = 9006104071832581.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2144 if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2145 detected_double_format = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2146 else if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2147 detected_double_format = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2148 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2149 detected_double_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2150 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2151 #else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2152 detected_double_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2153 #endif
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2154
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2155 #if SIZEOF_FLOAT == 4
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2156 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2157 float y = 16711938.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2158 if (memcmp(&y, "\x4b\x7f\x01\x02", 4) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2159 detected_float_format = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2160 else if (memcmp(&y, "\x02\x01\x7f\x4b", 4) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2161 detected_float_format = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2162 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2163 detected_float_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2164 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2165 #else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2166 detected_float_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2167 #endif
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2168
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2169 double_format = detected_double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2170 float_format = detected_float_format;
44267 f909872917b9 The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse. Christian Heimes <christian@cheimes.de> parents: 44262 diff changeset	2171
45060 c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	2172 /* Init float info */
c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	2173 if (FloatInfoType.tp_name == 0)
c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	2174 PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2175 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2176
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2177 int
0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2178 PyFloat_ClearFreeList(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	2179 {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2180 PyFloatObject *p;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2181 PyFloatBlock list, next;
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2182 int i;
0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2183 int u; /* remaining unfreed ints per block */
0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2184 int freelist_size = 0;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2185
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2186 list = block_list;
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2187 block_list = NULL;
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2188 free_list = NULL;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2189 while (list != NULL) {
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2190 u = 0;
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2191 for (i = 0, p = &list->objects[0];
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2192 i < N_FLOATOBJECTS;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2193 i++, p++) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	2194 if (PyFloat_CheckExact(p) && Py_REFCNT(p) != 0)
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2195 u++;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2196 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2197 next = list->next;
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2198 if (u) {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2199 list->next = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2200 block_list = list;
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2201 for (i = 0, p = &list->objects[0];
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2202 i < N_FLOATOBJECTS;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2203 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: 19753 diff changeset	2204 if (!PyFloat_CheckExact(p) \|\|
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	2205 Py_REFCNT(p) == 0) {
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	2206 Py_TYPE(p) = (struct _typeobject *)
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2207 free_list;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2208 free_list = p;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2209 }
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2210 }
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2211 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2212 else {
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2213 PyMem_FREE(list);
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2214 }
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2215 freelist_size += u;
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2216 list = next;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2217 }
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2218 return freelist_size;
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2219 }
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2220
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2221 void
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2222 PyFloat_Fini(void)
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2223 {
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2224 PyFloatObject *p;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2225 PyFloatBlock *list;
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2226 int i;
0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2227 int u; /* total unfreed floats per block */
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2228
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2229 u = PyFloat_ClearFreeList();
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	2230
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2231 if (!Py_VerboseFlag)
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2232 return;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2233 fprintf(stderr, "# cleanup floats");
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2234 if (!u) {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2235 fprintf(stderr, "\n");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2236 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2237 else {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2238 fprintf(stderr,
47897 0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2239 ": %d unfreed float%s\n",
0738119c1ef8 - Issue #2862: Make int and float freelist management consistent with other Gregory P. Smith <greg@mad-scientist.com> parents: 47889 diff changeset	2240 u, u == 1 ? "" : "s");
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2241 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2242 if (Py_VerboseFlag > 1) {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2243 list = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2244 while (list != NULL) {
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2245 for (i = 0, p = &list->objects[0];
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2246 i < N_FLOATOBJECTS;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	2247 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: 19753 diff changeset	2248 if (PyFloat_CheckExact(p) &&
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	2249 Py_REFCNT(p) != 0) {
56549 7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2250 char *buf = PyOS_double_to_string(
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2251 PyFloat_AS_DOUBLE(p), 'r',
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2252 0, 0, NULL);
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2253 if (buf) {
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2254 /* XXX(twouters) cast
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2255 refcount to long
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2256 until %zd is
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2257 universally
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2258 available
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2259 */
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2260 fprintf(stderr,
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	2261 "# <float at %p, refcnt=%ld, val=%s>\n",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	2262 p, (long)Py_REFCNT(p), buf);
56549 7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2263 PyMem_Free(buf);
7fa14be8ad73 Removed usage of unsafe PyFloat_AsString. Eric Smith <eric@trueblade.com> parents: 54777 diff changeset	2264 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2265 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2266 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2267 list = list->next;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2268 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2269 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	2270 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2271
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2272 /*----------------------------------------------------------------------------
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2273 * _PyFloat_{Pack,Unpack}{4,8}. See floatobject.h.
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2274 */
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2275 int
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2276 _PyFloat_Pack4(double x, unsigned char *p, int le)
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2277 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2278 if (float_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2279 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2280 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2281 double f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2282 unsigned int fbits;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2283 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2284
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2285 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2286 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2287 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2288 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2289
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2290 if (x < 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2291 sign = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2292 x = -x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2293 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2294 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2295 sign = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2296
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2297 f = frexp(x, &e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2298
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2299 /* Normalize f to be in the range [1.0, 2.0) */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2300 if (0.5 <= f && f < 1.0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2301 f *= 2.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2302 e--;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2303 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2304 else if (f == 0.0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2305 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2306 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2307 PyErr_SetString(PyExc_SystemError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2308 "frexp() result out of range");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2309 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2310 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2311
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2312 if (e >= 128)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2313 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2314 else if (e < -126) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2315 /* Gradual underflow */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2316 f = ldexp(f, 126 + e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2317 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2318 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2319 else if (!(e == 0 && f == 0.0)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2320 e += 127;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2321 f -= 1.0; /* Get rid of leading 1 */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2322 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2323
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2324 f = 8388608.0; / 2*23 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2325 fbits = (unsigned int)(f + 0.5); /* Round */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2326 assert(fbits <= 8388608);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2327 if (fbits >> 23) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2328 /* The carry propagated out of a string of 23 1 bits. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2329 fbits = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2330 ++e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2331 if (e >= 255)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2332 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2333 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2334
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2335 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2336 *p = (sign << 7) \| (e >> 1);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2337 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2338
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2339 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2340 *p = (char) (((e & 1) << 7) \| (fbits >> 16));
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2341 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2342
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2343 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2344 *p = (fbits >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2345 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2346
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2347 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2348 *p = fbits & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2349
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2350 /* Done */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2351 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2352
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2353 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2354 else {
35178 cf7a849ce61f Apparently some compiler gives a warning on Michael W. Hudson <mwh@python.net> parents: 34972 diff changeset	2355 float y = (float)x;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2356 const char s = (char)&y;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2357 int i, incr = 1;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2358
45759 354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2359 if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x))
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2360 goto Overflow;
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2361
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2362 if ((float_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2363 \|\| (float_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2364 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2365 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2366 }
45759 354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2367
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2368 for (i = 0; i < 4; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2369 p = s++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2370 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2371 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2372 return 0;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2373 }
45759 354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2374 Overflow:
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2375 PyErr_SetString(PyExc_OverflowError,
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2376 "float too large to pack with f format");
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	2377 return -1;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2378 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2379
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2380 int
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2381 _PyFloat_Pack8(double x, unsigned char *p, int le)
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2382 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2383 if (double_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2384 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2385 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2386 double f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2387 unsigned int fhi, flo;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2388 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2389
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2390 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2391 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2392 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2393 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2394
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2395 if (x < 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2396 sign = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2397 x = -x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2398 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2399 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2400 sign = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2401
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2402 f = frexp(x, &e);
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2403
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2404 /* Normalize f to be in the range [1.0, 2.0) */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2405 if (0.5 <= f && f < 1.0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2406 f *= 2.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2407 e--;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2408 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2409 else if (f == 0.0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2410 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2411 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2412 PyErr_SetString(PyExc_SystemError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2413 "frexp() result out of range");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2414 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2415 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2416
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2417 if (e >= 1024)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2418 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2419 else if (e < -1022) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2420 /* Gradual underflow */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2421 f = ldexp(f, 1022 + e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2422 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2423 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2424 else if (!(e == 0 && f == 0.0)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2425 e += 1023;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2426 f -= 1.0; /* Get rid of leading 1 */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2427 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2428
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2429 /* fhi receives the high 28 bits; flo the low 24 bits (== 52 bits) */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2430 f = 268435456.0; / 2*28 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2431 fhi = (unsigned int)f; /* Truncate */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2432 assert(fhi < 268435456);
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2433
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2434 f -= (double)fhi;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2435 f = 16777216.0; / 2*24 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2436 flo = (unsigned int)(f + 0.5); /* Round */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2437 assert(flo <= 16777216);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2438 if (flo >> 24) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2439 /* The carry propagated out of a string of 24 1 bits. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2440 flo = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2441 ++fhi;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2442 if (fhi >> 28) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2443 /* And it also progagated out of the next 28 bits. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2444 fhi = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2445 ++e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2446 if (e >= 2047)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2447 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2448 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2449 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2450
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2451 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2452 *p = (sign << 7) \| (e >> 4);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2453 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2454
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2455 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2456 *p = (unsigned char) (((e & 0xF) << 4) \| (fhi >> 24));
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2457 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2458
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2459 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2460 *p = (fhi >> 16) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2461 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2462
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2463 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2464 *p = (fhi >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2465 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2466
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2467 /* Fifth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2468 *p = fhi & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2469 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2470
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2471 /* Sixth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2472 *p = (flo >> 16) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2473 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2474
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2475 /* Seventh byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2476 *p = (flo >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2477 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2478
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2479 /* Eighth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2480 *p = flo & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2481 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2482
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2483 /* Done */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2484 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2485
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2486 Overflow:
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2487 PyErr_SetString(PyExc_OverflowError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2488 "float too large to pack with d format");
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2489 return -1;
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2490 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2491 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2492 const char s = (char)&x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2493 int i, incr = 1;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2494
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2495 if ((double_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2496 \|\| (double_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2497 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2498 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2499 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2500
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2501 for (i = 0; i < 8; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2502 p = s++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2503 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2504 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2505 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2506 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2507 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2508
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2509 double
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2510 _PyFloat_Unpack4(const unsigned char *p, int le)
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2511 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2512 if (float_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2513 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2514 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2515 unsigned int f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2516 double x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2517 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2518
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2519 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2520 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2521 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2522 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2523
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2524 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2525 sign = (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2526 e = (*p & 0x7F) << 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2527 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2528
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2529 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2530 e \|= (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2531 f = (*p & 0x7F) << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2532 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2533
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2534 if (e == 255) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2535 PyErr_SetString(
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2536 PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2537 "can't unpack IEEE 754 special value "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2538 "on non-IEEE platform");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2539 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2540 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2541
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2542 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2543 f \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2544 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2545
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2546 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2547 f \|= *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2548
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2549 x = (double)f / 8388608.0;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2550
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2551 /* XXX This sadly ignores Inf/NaN issues */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2552 if (e == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2553 e = -126;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2554 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2555 x += 1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2556 e -= 127;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2557 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2558 x = ldexp(x, e);
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2559
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2560 if (sign)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2561 x = -x;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2562
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2563 return x;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2564 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2565 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2566 float x;
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2567
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2568 if ((float_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2569 \|\| (float_format == ieee_big_endian_format && le)) {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2570 char buf[4];
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2571 char *d = &buf[3];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2572 int i;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2573
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2574 for (i = 0; i < 4; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2575 d-- = p++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2576 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2577 memcpy(&x, buf, 4);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2578 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2579 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2580 memcpy(&x, p, 4);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2581 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2582
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2583 return x;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2584 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2585 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2586
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2587 double
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2588 _PyFloat_Unpack8(const unsigned char *p, int le)
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2589 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2590 if (double_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2591 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2592 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2593 unsigned int fhi, flo;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2594 double x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2595 int incr = 1;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2596
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2597 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2598 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2599 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2600 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2601
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2602 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2603 sign = (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2604 e = (*p & 0x7F) << 4;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2605
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2606 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2607
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2608 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2609 e \|= (*p >> 4) & 0xF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2610 fhi = (*p & 0xF) << 24;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2611 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2612
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2613 if (e == 2047) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2614 PyErr_SetString(
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2615 PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2616 "can't unpack IEEE 754 special value "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2617 "on non-IEEE platform");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2618 return -1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2619 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2620
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2621 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2622 fhi \|= *p << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2623 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2624
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2625 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2626 fhi \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2627 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2628
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2629 /* Fifth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2630 fhi \|= *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2631 p += incr;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2632
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2633 /* Sixth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2634 flo = *p << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2635 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2636
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2637 /* Seventh byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2638 flo \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2639 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2640
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2641 /* Eighth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2642 flo \|= *p;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2643
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2644 x = (double)fhi + (double)flo / 16777216.0; /* 2*24 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2645 x /= 268435456.0; /* 2*28 /
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2646
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2647 if (e == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2648 e = -1022;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2649 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2650 x += 1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2651 e -= 1023;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2652 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2653 x = ldexp(x, e);
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2654
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2655 if (sign)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2656 x = -x;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2657
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2658 return x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2659 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2660 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2661 double x;
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2662
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2663 if ((double_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2664 \|\| (double_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2665 char buf[8];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2666 char *d = &buf[7];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2667 int i;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2668
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2669 for (i = 0; i < 8; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2670 d-- = p++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2671 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2672 memcpy(&x, buf, 8);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2673 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2674 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2675 memcpy(&x, p, 8);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2676 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2677
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2678 return x;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2679 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2680 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/floatobject.c @ 58765:2ba7677bfa95 legacy-trunk